# HG changeset patch # User Dirk Olmes # Date 1422275935 -3600 # Node ID a34cb404cef3e5729ebd02eed2e3a0213aaf07fb # Parent 82199c57ad93f31b23d2dfd5dccfb045a7ee1b79 remove the Ui_ prefix from the Qt designer files - The eric IDE will add it without any configuration. Rewrite the Makefile to behave as eric. diff -r 82199c57ad93 -r a34cb404cef3 AddFeed.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/AddFeed.ui Mon Jan 26 13:38:55 2015 +0100 @@ -0,0 +1,87 @@ + + + AddFeed + + + + 0 + 0 + 557 + 108 + + + + Add Feed + + + + :/newPrefix/worm.png:/newPrefix/worm.png + + + true + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + Feed URL + + + + + + + url + buttonBox + + + + + + + buttonBox + accepted() + AddFeed + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AddFeed + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff -r 82199c57ad93 -r a34cb404cef3 FeedSettings.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/FeedSettings.ui Mon Jan 26 13:38:55 2015 +0100 @@ -0,0 +1,256 @@ + + + FeedSettings + + + + 0 + 0 + 474 + 222 + + + + Dialog + + + + :/newPrefix/worm.png:/newPrefix/worm.png + + + + + 20 + 180 + 341 + 32 + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + 10 + 110 + 361 + 22 + + + + load article's url instead of displaying summary + + + + + + 10 + 140 + 410 + 22 + + + + when loading article's url, always use external browser + + + + + + 11 + 11 + 28 + 16 + + + + + 35 + 16777215 + + + + URL + + + + + + 52 + 11 + 358 + 16 + + + + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + 10 + 30 + 401 + 28 + + + + + + + Title + + + + + + + + + + + + 10 + 70 + 221 + 28 + + + + + + + Update every + + + + + + + + + + minutes + + + + + + + + + + + + buttonBox + accepted() + FeedSettings + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + FeedSettings + reject() + + + 316 + 260 + + + 286 + 274 + + + + + autoLoadArticle + stateChanged(int) + FeedSettings + autoLoadArticleChanged() + + + 175 + 20 + + + 199 + 149 + + + + + feedTitle + editingFinished() + FeedSettings + editingTitleFinished() + + + 212 + 21 + + + 199 + 62 + + + + + alwaysOpenInBrowser + stateChanged(int) + FeedSettings + alwaysOpenInExternalBrowser() + + + 195 + 80 + + + 199 + 69 + + + + + updateInterval + editingFinished() + FeedSettings + editingUpdateIntervalFinished() + + + 127 + 56 + + + 199 + 88 + + + + + + autoLoadArticleChanged() + editingTitleFinished() + alwaysOpenInExternalBrowser() + editingUpdateIntervalFinished() + + diff -r 82199c57ad93 -r a34cb404cef3 MainWindow.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MainWindow.ui Mon Jan 26 13:38:55 2015 +0100 @@ -0,0 +1,623 @@ + + + MainWindow + + + + 0 + 0 + 992 + 750 + + + + Feedworm + + + + :/newPrefix/worm.png:/newPrefix/worm.png + + + + + + + Qt::Horizontal + + + + + + + + 8 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::NoTextInteraction + + + + + + + true + + + QListView::Fixed + + + + + + + + Qt::Vertical + + + + + + + + 8 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::NoTextInteraction + + + + + + + true + + + QAbstractItemView::SelectRows + + + false + + + false + + + + + + + + + about:blank + + + + + + + + + + + + 0 + 0 + 992 + 23 + + + + + Feed + + + + + + + + + + + false + + + Article + + + + + + + + + Feedworm + + + + + + + + + + + + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + + + + Quit + + + Ctrl+Q + + + + + Add ... + + + Ctrl+A + + + + + Mark selected read + + + M + + + + + Open in browser + + + Ctrl+O + + + + + false + + + + :/newPrefix/open_in_browser.png:/newPrefix/open_in_browser.png + + + Open link + + + L + + + + + true + + + Preferences + + + Ctrl+. + + + + + false + + + Settings ... + + + + + false + + + + :/newPrefix/mark_all_read.jpg:/newPrefix/mark_all_read.jpg + + + Mark all read + + + Mark all articles in current feed as read + + + Ctrl+M + + + + + false + + + Update + + + Update selected feed + + + Ctrl+U + + + + + false + + + Update feeds + + + Ctrl+Shift+U + + + + + false + + + Delete + + + + + false + + + + :/newPrefix/mark_selected_read.jpg:/newPrefix/mark_selected_read.jpg + + + Mark selected read + + + + + Copy article URL + + + Ctrl+Shift+C + + + + + + :/newPrefix/zoom_in.png:/newPrefix/zoom_in.png + + + Zoom In + + + Zoom In + + + + + + :/newPrefix/zoom_out.png:/newPrefix/zoom_out.png + + + Zoom Out + + + Zoom Out + + + + + + QWebView + QWidget +

QtWebKit/QWebView

+ + + + + + + + actionQuit + activated() + MainWindow + close() + + + -1 + -1 + + + 399 + 299 + + + + + actionAddFeed + activated() + MainWindow + addFeed() + + + -1 + -1 + + + 495 + 374 + + + + + feedList + clicked(QModelIndex) + MainWindow + feedSelected(QModelIndex) + + + 126 + 377 + + + 495 + 374 + + + + + feedEntryTable + clicked(QModelIndex) + MainWindow + feedEntrySelected(QModelIndex) + + + 616 + 117 + + + 495 + 374 + + + + + actionMarkSelectedRead + activated() + MainWindow + toggleReadOnSelectedEntry() + + + -1 + -1 + + + 495 + 374 + + + + + actionOpenLink + activated() + MainWindow + openLinkFromSelectedEntry() + + + -1 + -1 + + + 495 + 374 + + + + + actionOpenInBrowser + activated() + MainWindow + openSelectedEntryInBrowser() + + + -1 + -1 + + + 495 + 374 + + + + + actionPreferences + activated() + MainWindow + showPreferences() + + + -1 + -1 + + + 495 + 374 + + + + + actionFeedSettings + activated() + MainWindow + showFeedSettings() + + + -1 + -1 + + + 495 + 374 + + + + + actionMarkFeedRead + activated() + MainWindow + markSelectedFeedRead() + + + -1 + -1 + + + 495 + 374 + + + + + actionDeleteFeed + activated() + MainWindow + deleteFeed() + + + -1 + -1 + + + 495 + 374 + + + + + feedEntryTable + doubleClicked(QModelIndex) + MainWindow + feedEntryDoubleClicked() + + + 616 + 117 + + + 495 + 374 + + + + + actionMarkSelectedEntriesRead + activated() + MainWindow + markSelectedEntriesRead() + + + -1 + -1 + + + 495 + 374 + + + + + actionCopyArticleURL + activated() + MainWindow + copyArticleURLToClipboard() + + + -1 + -1 + + + 495 + 374 + + + + + actionZoomIn + activated() + MainWindow + zoomIn() + + + -1 + -1 + + + 495 + 374 + + + + + actionZoomOut + activated() + MainWindow + zoomOut() + + + -1 + -1 + + + 495 + 374 + + + + + + addFeed() + feedSelected(QModelIndex) + feedEntrySelected(QModelIndex) + toggleReadOnSelectedEntry() + openSelectedEntryInBrowser() + openLinkFromSelectedEntry() + showPreferences() + showFeedSettings() + markSelectedFeedRead() + deleteFeed() + feedEntryDoubleClicked() + markSelectedEntriesRead() + copyArticleURLToClipboard() + zoomIn() + zoomOut() + + diff -r 82199c57ad93 -r a34cb404cef3 Makefile --- a/Makefile Mon Jan 26 06:26:15 2015 +0100 +++ b/Makefile Mon Jan 26 13:38:55 2015 +0100 @@ -6,7 +6,7 @@ all: $(PY_FILES) $(RC_FILES) %.py: %.ui - pyuic4 -o $@ $< + pyuic4 -o Ui_$@ $< %_rc.py: %.qrc pyrcc4 -o $@ $< diff -r 82199c57ad93 -r a34cb404cef3 Preferences.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Preferences.ui Mon Jan 26 13:38:55 2015 +0100 @@ -0,0 +1,274 @@ + + + Preferences + + + + 0 + 0 + 373 + 288 + + + + Preferences + + + + :/newPrefix/worm.png:/newPrefix/worm.png + + + + + 10 + 250 + 160 + 27 + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + 10 + 10 + 141 + 22 + + + + Start maximized + + + + + + 10 + 70 + 171 + 22 + + + + Hide read feed entries + + + + + + 10 + 40 + 301 + 22 + + + + Show only feeds that have unread entries + + + + + + 10 + 100 + 353 + 106 + + + + Web Proxy + + + + + 6 + 20 + 336 + 78 + + + + + + + Port + + + + + + + + + + + + + Host + + + + + + + Use proxy + + + + + + + + + + 11 + 215 + 136 + 17 + + + + Keep feed entries for + + + + + + 150 + 210 + 31 + 23 + + + + + + + + + + 190 + 215 + 31 + 17 + + + + days + + + + + + + + + buttonBox + accepted() + Preferences + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + Preferences + reject() + + + 316 + 260 + + + 286 + 274 + + + + + startMaximized + stateChanged(int) + Preferences + startMaximizedChanged() + + + 80 + 20 + + + 199 + 149 + + + + + hideReadFeedEntries + stateChanged(int) + Preferences + hideReadFeedEntriesChanged() + + + 95 + 50 + + + 199 + 149 + + + + + showOnlyUnreadFeeds + stateChanged(int) + Preferences + showOnlyFeedsWithUnreadEntries() + + + 160 + 50 + + + 199 + 75 + + + + + daysToKeepFeedEntries + editingFinished() + Preferences + daysToKeepFeedEntriesFinishedEditing() + + + 165 + 211 + + + 194 + 138 + + + + + + startMaximizedChanged() + hideReadFeedEntriesChanged() + showOnlyFeedsWithUnreadEntries() + daysToKeepFeedEntriesFinishedEditing() + + diff -r 82199c57ad93 -r a34cb404cef3 Ui_AddFeed.ui --- a/Ui_AddFeed.ui Mon Jan 26 06:26:15 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ - - - AddFeed - - - - 0 - 0 - 557 - 108 - - - - Add Feed - - - - :/newPrefix/worm.png:/newPrefix/worm.png - - - true - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - Feed URL - - - - - - - url - buttonBox - - - - - - - buttonBox - accepted() - AddFeed - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - AddFeed - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff -r 82199c57ad93 -r a34cb404cef3 Ui_FeedSettings.ui --- a/Ui_FeedSettings.ui Mon Jan 26 06:26:15 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,256 +0,0 @@ - - - FeedSettings - - - - 0 - 0 - 474 - 222 - - - - Dialog - - - - :/newPrefix/worm.png:/newPrefix/worm.png - - - - - 20 - 180 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 10 - 110 - 361 - 22 - - - - load article's url instead of displaying summary - - - - - - 10 - 140 - 410 - 22 - - - - when loading article's url, always use external browser - - - - - - 11 - 11 - 28 - 16 - - - - - 35 - 16777215 - - - - URL - - - - - - 52 - 11 - 358 - 16 - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - 10 - 30 - 401 - 28 - - - - - - - Title - - - - - - - - - - - - 10 - 70 - 221 - 28 - - - - - - - Update every - - - - - - - - - - minutes - - - - - - - - - - - - buttonBox - accepted() - FeedSettings - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - FeedSettings - reject() - - - 316 - 260 - - - 286 - 274 - - - - - autoLoadArticle - stateChanged(int) - FeedSettings - autoLoadArticleChanged() - - - 175 - 20 - - - 199 - 149 - - - - - feedTitle - editingFinished() - FeedSettings - editingTitleFinished() - - - 212 - 21 - - - 199 - 62 - - - - - alwaysOpenInBrowser - stateChanged(int) - FeedSettings - alwaysOpenInExternalBrowser() - - - 195 - 80 - - - 199 - 69 - - - - - updateInterval - editingFinished() - FeedSettings - editingUpdateIntervalFinished() - - - 127 - 56 - - - 199 - 88 - - - - - - autoLoadArticleChanged() - editingTitleFinished() - alwaysOpenInExternalBrowser() - editingUpdateIntervalFinished() - - diff -r 82199c57ad93 -r a34cb404cef3 Ui_MainWindow.ui --- a/Ui_MainWindow.ui Mon Jan 26 06:26:15 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,623 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 992 - 750 - - - - Feedworm - - - - :/newPrefix/worm.png:/newPrefix/worm.png - - - - - - - Qt::Horizontal - - - - - - - - 8 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::NoTextInteraction - - - - - - - true - - - QListView::Fixed - - - - - - - - Qt::Vertical - - - - - - - - 8 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::NoTextInteraction - - - - - - - true - - - QAbstractItemView::SelectRows - - - false - - - false - - - - - - - - - about:blank - - - - - - - - - - - - 0 - 0 - 992 - 23 - - - - - Feed - - - - - - - - - - - false - - - Article - - - - - - - - - Feedworm - - - - - - - - - - - - - - toolBar - - - TopToolBarArea - - - false - - - - - - - - - - - Quit - - - Ctrl+Q - - - - - Add ... - - - Ctrl+A - - - - - Mark selected read - - - M - - - - - Open in browser - - - Ctrl+O - - - - - false - - - - :/newPrefix/open_in_browser.png:/newPrefix/open_in_browser.png - - - Open link - - - L - - - - - true - - - Preferences - - - Ctrl+. - - - - - false - - - Settings ... - - - - - false - - - - :/newPrefix/mark_all_read.jpg:/newPrefix/mark_all_read.jpg - - - Mark all read - - - Mark all articles in current feed as read - - - Ctrl+M - - - - - false - - - Update - - - Update selected feed - - - Ctrl+U - - - - - false - - - Update feeds - - - Ctrl+Shift+U - - - - - false - - - Delete - - - - - false - - - - :/newPrefix/mark_selected_read.jpg:/newPrefix/mark_selected_read.jpg - - - Mark selected read - - - - - Copy article URL - - - Ctrl+Shift+C - - - - - - :/newPrefix/zoom_in.png:/newPrefix/zoom_in.png - - - Zoom In - - - Zoom In - - - - - - :/newPrefix/zoom_out.png:/newPrefix/zoom_out.png - - - Zoom Out - - - Zoom Out - - - - - - QWebView - QWidget -

QtWebKit/QWebView

- - - - - - - - actionQuit - activated() - MainWindow - close() - - - -1 - -1 - - - 399 - 299 - - - - - actionAddFeed - activated() - MainWindow - addFeed() - - - -1 - -1 - - - 495 - 374 - - - - - feedList - clicked(QModelIndex) - MainWindow - feedSelected(QModelIndex) - - - 126 - 377 - - - 495 - 374 - - - - - feedEntryTable - clicked(QModelIndex) - MainWindow - feedEntrySelected(QModelIndex) - - - 616 - 117 - - - 495 - 374 - - - - - actionMarkSelectedRead - activated() - MainWindow - toggleReadOnSelectedEntry() - - - -1 - -1 - - - 495 - 374 - - - - - actionOpenLink - activated() - MainWindow - openLinkFromSelectedEntry() - - - -1 - -1 - - - 495 - 374 - - - - - actionOpenInBrowser - activated() - MainWindow - openSelectedEntryInBrowser() - - - -1 - -1 - - - 495 - 374 - - - - - actionPreferences - activated() - MainWindow - showPreferences() - - - -1 - -1 - - - 495 - 374 - - - - - actionFeedSettings - activated() - MainWindow - showFeedSettings() - - - -1 - -1 - - - 495 - 374 - - - - - actionMarkFeedRead - activated() - MainWindow - markSelectedFeedRead() - - - -1 - -1 - - - 495 - 374 - - - - - actionDeleteFeed - activated() - MainWindow - deleteFeed() - - - -1 - -1 - - - 495 - 374 - - - - - feedEntryTable - doubleClicked(QModelIndex) - MainWindow - feedEntryDoubleClicked() - - - 616 - 117 - - - 495 - 374 - - - - - actionMarkSelectedEntriesRead - activated() - MainWindow - markSelectedEntriesRead() - - - -1 - -1 - - - 495 - 374 - - - - - actionCopyArticleURL - activated() - MainWindow - copyArticleURLToClipboard() - - - -1 - -1 - - - 495 - 374 - - - - - actionZoomIn - activated() - MainWindow - zoomIn() - - - -1 - -1 - - - 495 - 374 - - - - - actionZoomOut - activated() - MainWindow - zoomOut() - - - -1 - -1 - - - 495 - 374 - - - - - - addFeed() - feedSelected(QModelIndex) - feedEntrySelected(QModelIndex) - toggleReadOnSelectedEntry() - openSelectedEntryInBrowser() - openLinkFromSelectedEntry() - showPreferences() - showFeedSettings() - markSelectedFeedRead() - deleteFeed() - feedEntryDoubleClicked() - markSelectedEntriesRead() - copyArticleURLToClipboard() - zoomIn() - zoomOut() - - diff -r 82199c57ad93 -r a34cb404cef3 Ui_Preferences.ui --- a/Ui_Preferences.ui Mon Jan 26 06:26:15 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,274 +0,0 @@ - - - Preferences - - - - 0 - 0 - 373 - 288 - - - - Preferences - - - - :/newPrefix/worm.png:/newPrefix/worm.png - - - - - 10 - 250 - 160 - 27 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 10 - 10 - 141 - 22 - - - - Start maximized - - - - - - 10 - 70 - 171 - 22 - - - - Hide read feed entries - - - - - - 10 - 40 - 301 - 22 - - - - Show only feeds that have unread entries - - - - - - 10 - 100 - 353 - 106 - - - - Web Proxy - - - - - 6 - 20 - 336 - 78 - - - - - - - Port - - - - - - - - - - - - - Host - - - - - - - Use proxy - - - - - - - - - - 11 - 215 - 136 - 17 - - - - Keep feed entries for - - - - - - 150 - 210 - 31 - 23 - - - - - - - - - - 190 - 215 - 31 - 17 - - - - days - - - - - - - - - buttonBox - accepted() - Preferences - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Preferences - reject() - - - 316 - 260 - - - 286 - 274 - - - - - startMaximized - stateChanged(int) - Preferences - startMaximizedChanged() - - - 80 - 20 - - - 199 - 149 - - - - - hideReadFeedEntries - stateChanged(int) - Preferences - hideReadFeedEntriesChanged() - - - 95 - 50 - - - 199 - 149 - - - - - showOnlyUnreadFeeds - stateChanged(int) - Preferences - showOnlyFeedsWithUnreadEntries() - - - 160 - 50 - - - 199 - 75 - - - - - daysToKeepFeedEntries - editingFinished() - Preferences - daysToKeepFeedEntriesFinishedEditing() - - - 165 - 211 - - - 194 - 138 - - - - - - startMaximizedChanged() - hideReadFeedEntriesChanged() - showOnlyFeedsWithUnreadEntries() - daysToKeepFeedEntriesFinishedEditing() - -