From 96de427112088e8323a2666e370b4e008aafbfce Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Fri, 26 Nov 2010 18:08:59 +0100 Subject: [PATCH] Revert "Added save menu action." Wrong branch. This reverts commit 1e4146c78d408760975b3f719c5ec177cfcf9674. --- linkcheck/gui/linkchecker_rc.py | 72 +++------------------------ linkcheck/gui/linkchecker_ui_main.py | 66 +++++++++++------------- linkcheck/gui/rc/Makefile | 5 -- linkcheck/gui/rc/linkchecker.qrc | 1 - linkcheck/gui/rc/save.png | Bin 839 -> 0 bytes linkcheck/gui/ui/main.ui | 49 +++++++----------- 6 files changed, 53 insertions(+), 140 deletions(-) delete mode 100644 linkcheck/gui/rc/save.png diff --git a/linkcheck/gui/linkchecker_rc.py b/linkcheck/gui/linkchecker_rc.py index eb55181e..e80c44c5 100644 --- a/linkcheck/gui/linkchecker_rc.py +++ b/linkcheck/gui/linkchecker_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Fr. Nov 26 18:06:58 2010 +# Created: Sa. Nov 6 13:44:31 2010 # by: The Resource Compiler for PyQt (Qt v4.6.3) # # WARNING! All changes made in this file will be lost! @@ -273,61 +273,6 @@ qt_resource_data = "\ \x3e\x34\x35\x20\x9f\x9b\x22\x5b\x68\x66\xfe\x20\x2b\x30\xda\x01\ \x68\x0b\xe8\x88\x71\x7b\x2b\x7d\x00\x00\x00\x00\x49\x45\x4e\x44\ \xae\x42\x60\x82\ -\x00\x00\x03\x47\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x01\xbb\x00\x00\x01\xbb\ -\x01\x3a\xec\xe3\xe2\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ -\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ -\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x02\xc4\x49\x44\ -\x41\x54\x78\xda\x9d\x93\x5b\x48\x53\x71\x1c\xc7\x3f\xe7\x6c\xe9\ -\xa6\x36\x8f\xb5\x91\xa7\x48\x6c\x0b\x32\x8c\x08\xa4\xfb\x58\x2d\ -\xbb\x88\xd5\x53\x62\x17\x8b\xae\xf3\xb5\xb2\x46\x17\x24\x28\xba\ -\x47\x05\x41\x85\xbd\x44\x74\x2f\x0d\x2a\x95\x82\xc0\x82\x6e\x08\ -\x25\xdd\x2f\x76\xa3\x8b\xb5\x6a\x73\xd3\xed\x2c\xdd\x39\xae\x79\ -\x40\x5d\xf4\x12\x7d\xe1\xfb\x76\xbe\x1f\xbe\xbf\xef\x9f\x23\xc4\ -\xe3\x71\xfe\x45\xd5\x6b\xe4\x41\x79\xcf\xf3\x1b\xd4\x48\xf4\x4d\ -\x3f\x59\x2e\xcf\xaf\xae\xfe\x06\xa0\x03\xe6\xce\x99\xd3\xfa\xeb\ -\x57\x87\xb4\x7a\xad\x97\x64\x09\x22\x80\x88\x40\x8c\x91\x6c\xe1\ -\x63\xad\x84\xe5\xf2\x0b\x9e\x29\x0a\x17\x26\x4e\x0c\x5e\xa9\xab\ -\xcb\x32\x02\x28\x11\x45\xca\x96\xb3\x71\x4d\x75\x13\x4f\x06\x74\ -\x5b\x88\x13\x7d\xb4\x98\x1f\x3e\x91\x65\xf5\xaf\xf1\x48\x22\xb6\ -\x9f\x61\xc4\xd6\xa0\x04\xa0\x03\xba\xba\xba\x30\xa5\x9a\x30\xa5\ -\x18\x38\x79\xe3\x31\xc9\xca\xf4\x1d\x64\x8c\xf5\x15\x0b\x2b\x15\ -\x04\xd5\x4f\x91\x37\x85\x9a\x9b\x23\x09\xbe\x35\xd2\x0b\xd0\x12\ -\x00\x55\x55\x11\x45\x58\x5c\x38\x0a\x01\xf4\x26\xaf\x1a\xab\xc8\ -\xb5\x3c\xa5\xb8\xa2\x03\xff\xcf\xef\x9c\xdd\x9a\x46\x28\x65\x1a\ -\xb7\xdf\xb4\x24\x32\x1a\x00\x62\x4f\x03\x4d\xd3\x68\x8f\x76\x12\ -\xed\x54\x51\x12\x7e\xff\xbc\x96\xbc\xd4\xe3\x94\x6d\xed\xe4\xdd\ -\xc7\x00\x47\xd6\x9b\x21\x2d\x8f\xc6\x2f\x13\x30\x99\xcd\x00\xf4\ -\x9d\xa0\x69\x7a\x83\x70\x02\x70\xfe\xda\x3d\x52\x63\xef\xf1\x4c\ -\x7e\x4d\xf9\x2e\x81\x47\x2f\x43\x6c\x28\x53\xc9\xb0\x48\xec\xbe\ -\x32\x8c\xd9\x33\x25\xa4\xcc\x4c\xda\xdb\xda\xfe\x6e\xd0\x16\x8e\ -\xe2\x1a\x6d\xc5\x33\xc5\xcf\xe1\x73\x9f\xb8\xdb\x14\x62\xc9\xf4\ -\x08\xee\x82\x74\x2e\x36\xcd\x20\x7f\xc4\x70\x0a\xc6\xbb\xba\xbf\ -\xd7\x9d\x34\xa2\x86\xa6\xaa\x6c\x5b\xb7\x82\x03\xde\xa1\x9c\xbe\ -\xfe\x95\xaa\xd3\x2f\x28\xc8\xfd\x4c\x59\xa1\x91\xe5\x7b\x44\x82\ -\x91\x06\x1c\x0e\x07\x6f\x9f\x3c\xa0\x27\xd3\x37\xa2\x96\x20\x6a\ -\x9d\x6c\x5c\xaa\x71\xeb\xc6\x25\xf6\x9e\xca\x22\x77\xa0\x8f\x1d\ -\xe5\x06\x56\xed\x4b\xe3\xab\x3f\x8e\x7d\x58\x36\x46\x83\x41\x3f\ -\xb5\x27\xf3\xc7\x06\x2b\xa7\x7f\xa0\xf5\x9b\x9f\xed\x67\x24\x06\ -\x59\xda\x38\xe6\x85\xfd\x97\xed\x08\x19\x56\x36\x6e\x9a\x87\xcb\ -\xe5\xa2\x74\x5e\x89\x7e\xaa\xc3\x6e\xd7\x33\xbd\x1b\x38\x0b\x72\ -\x49\x4f\x37\x50\x71\xd4\x42\x7f\xb3\xca\xe1\xd5\xed\xec\x3a\xd5\ -\x45\xc3\x03\x8d\x9c\x9c\x1c\x64\x59\xa6\xb9\xb9\x19\x79\xf0\x60\ -\x44\xa3\x41\x7f\xf6\x98\xaa\xf6\x01\x0a\xdd\x93\x90\xc7\x6c\x27\ -\xd3\x62\x62\x9f\xe7\x3b\x57\xef\x08\x9c\xa8\x8f\x61\xb3\xd9\x70\ -\x3a\x9d\x84\x42\x21\xdd\xf1\xee\xf1\x12\xd5\xad\x56\x2b\xb1\x58\ -\x0c\x1d\xb0\xad\x62\xbe\x71\xc8\x10\x1b\x4a\xa0\x91\x35\x0b\x24\ -\xee\xbf\xb4\x72\xa8\x26\x8d\x01\x52\x16\xc5\xc5\xc5\x84\xc3\xe1\ -\x5e\x40\x24\x12\xd1\x83\x51\x45\xd1\x47\x07\x30\xf6\x33\x65\x6c\ -\xae\xdc\x59\xc5\xac\xb1\x16\xf5\x6c\xbd\xcf\xe8\x2e\x2a\x65\xf9\ -\x4a\x03\x00\x81\x40\x80\x64\x7d\x69\x69\x01\xe2\x3c\x6c\x6a\x42\ -\x34\x88\x41\x00\x2a\x56\x15\x2d\xf2\x94\x8c\x73\x74\xff\x95\xff\ -\xe3\xdf\xfd\x96\x70\x9f\x9f\x28\xbe\x9f\x00\x00\x00\x00\x49\x45\ -\x4e\x44\xae\x42\x60\x82\ \x00\x00\x02\xd2\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -633,10 +578,6 @@ qt_resource_name = "\ \x06\x7c\x5a\x07\ \x00\x63\ \x00\x6f\x00\x70\x00\x79\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x08\ -\x08\xc8\x58\x67\ -\x00\x73\ -\x00\x61\x00\x76\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x0a\ \x09\xb2\x67\xc7\ \x00\x63\ @@ -661,18 +602,17 @@ qt_resource_name = "\ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x00\x00\x00\x02\ -\x00\x00\x00\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x15\xb9\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x0b\x00\x00\x00\x02\ +\x00\x00\x00\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x12\x6e\ \x00\x00\x00\x80\x00\x00\x00\x00\x00\x01\x00\x00\x0d\xaf\ -\x00\x00\x00\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x1b\xcd\ +\x00\x00\x00\xe0\x00\x00\x00\x00\x00\x01\x00\x00\x18\x82\ \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ \x00\x00\x00\x54\x00\x00\x00\x00\x00\x01\x00\x00\x08\x27\ \x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xb6\ \x00\x00\x00\x96\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x98\ -\x00\x00\x00\xac\x00\x00\x00\x00\x00\x01\x00\x00\x12\xe3\ \x00\x00\x00\x28\x00\x00\x00\x00\x00\x01\x00\x00\x02\xe2\ -\x00\x00\x00\xe0\x00\x00\x00\x00\x00\x01\x00\x00\x19\x1d\ -\x00\x00\x01\x12\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x9a\ +\x00\x00\x00\xca\x00\x00\x00\x00\x00\x01\x00\x00\x15\xd2\ +\x00\x00\x00\xfc\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x4f\ \x00\x00\x00\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x04\xd9\ " diff --git a/linkcheck/gui/linkchecker_ui_main.py b/linkcheck/gui/linkchecker_ui_main.py index 14a5b831..21bacdaf 100644 --- a/linkcheck/gui/linkchecker_ui_main.py +++ b/linkcheck/gui/linkchecker_ui_main.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/main.ui' # -# Created: Fri Nov 26 18:06:58 2010 +# Created: Tue Nov 23 23:03:33 2010 # by: PyQt4 UI code generator 4.7.3 # # WARNING! All changes made in this file will be lost! @@ -70,67 +70,61 @@ class Ui_MainWindow(object): self.menubar = QtGui.QMenuBar(MainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 638, 21)) self.menubar.setObjectName("menubar") + self.menuLinkChecka = QtGui.QMenu(self.menubar) + self.menuLinkChecka.setObjectName("menuLinkChecka") self.menuEdit = QtGui.QMenu(self.menubar) self.menuEdit.setObjectName("menuEdit") self.menuHelp = QtGui.QMenu(self.menubar) self.menuHelp.setObjectName("menuHelp") - self.menuLinkChecka = QtGui.QMenu(self.menubar) - self.menuLinkChecka.setObjectName("menuLinkChecka") MainWindow.setMenuBar(self.menubar) self.statusBar = QtGui.QStatusBar(MainWindow) self.statusBar.setObjectName("statusBar") MainWindow.setStatusBar(self.statusBar) - self.actionAbout = QtGui.QAction(MainWindow) + self.actionQuit = QtGui.QAction(MainWindow) icon2 = QtGui.QIcon() - icon2.addPixmap(QtGui.QPixmap(":/icons/about.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionAbout.setIcon(icon2) + icon2.addPixmap(QtGui.QPixmap(":/icons/exit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.actionQuit.setIcon(icon2) + self.actionQuit.setObjectName("actionQuit") + self.actionAbout = QtGui.QAction(MainWindow) + icon3 = QtGui.QIcon() + icon3.addPixmap(QtGui.QPixmap(":/icons/about.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.actionAbout.setIcon(icon3) self.actionAbout.setObjectName("actionAbout") self.actionHelp = QtGui.QAction(MainWindow) - icon3 = QtGui.QIcon() - icon3.addPixmap(QtGui.QPixmap(":/icons/help.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionHelp.setIcon(icon3) + icon4 = QtGui.QIcon() + icon4.addPixmap(QtGui.QPixmap(":/icons/help.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.actionHelp.setIcon(icon4) self.actionHelp.setObjectName("actionHelp") self.actionViewOnline = QtGui.QAction(MainWindow) - icon4 = QtGui.QIcon() - icon4.addPixmap(QtGui.QPixmap(":/icons/online.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionViewOnline.setIcon(icon4) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(":/icons/online.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.actionViewOnline.setIcon(icon5) self.actionViewOnline.setObjectName("actionViewOnline") self.actionOptions = QtGui.QAction(MainWindow) - icon5 = QtGui.QIcon() - icon5.addPixmap(QtGui.QPixmap(":/icons/preferences.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionOptions.setIcon(icon5) + icon6 = QtGui.QIcon() + icon6.addPixmap(QtGui.QPixmap(":/icons/preferences.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.actionOptions.setIcon(icon6) self.actionOptions.setObjectName("actionOptions") self.actionCopyToClipboard = QtGui.QAction(MainWindow) - icon6 = QtGui.QIcon() - icon6.addPixmap(QtGui.QPixmap(":/icons/copy.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionCopyToClipboard.setIcon(icon6) + icon7 = QtGui.QIcon() + icon7.addPixmap(QtGui.QPixmap(":/icons/copy.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.actionCopyToClipboard.setIcon(icon7) self.actionCopyToClipboard.setObjectName("actionCopyToClipboard") self.actionViewParentOnline = QtGui.QAction(MainWindow) - self.actionViewParentOnline.setIcon(icon4) + self.actionViewParentOnline.setIcon(icon5) self.actionViewParentOnline.setObjectName("actionViewParentOnline") self.actionViewParentSource = QtGui.QAction(MainWindow) - self.actionViewParentSource.setIcon(icon4) + self.actionViewParentSource.setIcon(icon5) self.actionViewParentSource.setObjectName("actionViewParentSource") self.actionDebug = QtGui.QAction(MainWindow) self.actionDebug.setObjectName("actionDebug") self.actionViewProperties = QtGui.QAction(MainWindow) self.actionViewProperties.setObjectName("actionViewProperties") - self.actionSave = QtGui.QAction(MainWindow) - icon7 = QtGui.QIcon() - icon7.addPixmap(QtGui.QPixmap(":/icons/save.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionSave.setIcon(icon7) - self.actionSave.setObjectName("actionSave") - self.actionQuit = QtGui.QAction(MainWindow) - icon8 = QtGui.QIcon() - icon8.addPixmap(QtGui.QPixmap(":/icons/exit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.actionQuit.setIcon(icon8) - self.actionQuit.setObjectName("actionQuit") + self.menuLinkChecka.addAction(self.actionQuit) self.menuEdit.addAction(self.actionOptions) self.menuHelp.addAction(self.actionAbout) self.menuHelp.addAction(self.actionHelp) self.menuHelp.addAction(self.actionDebug) - self.menuLinkChecka.addAction(self.actionSave) - self.menuLinkChecka.addAction(self.actionQuit) self.menubar.addAction(self.menuLinkChecka.menuAction()) self.menubar.addAction(self.menuEdit.menuAction()) self.menubar.addAction(self.menuHelp.menuAction()) @@ -144,9 +138,11 @@ class Ui_MainWindow(object): self.label.setText(_("URL")) self.controlButton.setToolTip(_("Start checking the given URL.")) self.controlButton.setText(_("Start")) + self.menuLinkChecka.setTitle(_("File")) self.menuEdit.setTitle(_("Edit")) self.menuHelp.setTitle(_("Help")) - self.menuLinkChecka.setTitle(_("File")) + self.actionQuit.setText(_("Quit")) + self.actionQuit.setShortcut(_("Ctrl+Q")) self.actionAbout.setText(_("About")) self.actionHelp.setText(_("Help")) self.actionViewOnline.setText(_("View online")) @@ -162,9 +158,5 @@ class Ui_MainWindow(object): self.actionDebug.setText(_("Debug")) self.actionViewProperties.setText(_("View properties")) self.actionViewProperties.setToolTip(_("View URL properties")) - self.actionSave.setText(_("Save...")) - self.actionSave.setShortcut(_("Ctrl+S")) - self.actionQuit.setText(_("Quit")) - self.actionQuit.setShortcut(_("Ctrl+Q")) import linkchecker_rc diff --git a/linkcheck/gui/rc/Makefile b/linkcheck/gui/rc/Makefile index bd8f848e..4702d1fa 100644 --- a/linkcheck/gui/rc/Makefile +++ b/linkcheck/gui/rc/Makefile @@ -9,7 +9,6 @@ ICONS = \ online.png \ options.png \ preferences.png \ - save.png \ start.png \ stop.png \ about.png \ @@ -22,9 +21,6 @@ all: $(ICONS) #app.png: $(CRYSTAL)/16x16/apps/agt_web.png # cp $< $@ -save.png: $(OXYGEN)/actions/document-save-as.png - cp $< $@ - start.png: $(OXYGEN)/actions/media-playback-start.png cp $< $@ @@ -55,6 +51,5 @@ options.png: $(OXYGEN)/categories/preferences-system-network.png preferences.png: $(OXYGEN)/categories/preferences-other.png cp $< $@ - clean: rm -f *.png diff --git a/linkcheck/gui/rc/linkchecker.qrc b/linkcheck/gui/rc/linkchecker.qrc index a18984d8..8810e2ce 100644 --- a/linkcheck/gui/rc/linkchecker.qrc +++ b/linkcheck/gui/rc/linkchecker.qrc @@ -1,6 +1,5 @@ - save.png copy.png about.png help.png diff --git a/linkcheck/gui/rc/save.png b/linkcheck/gui/rc/save.png deleted file mode 100644 index 821ca125fc1ca42a00dad89e15841e0044667e59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmV-N1GxN&P)nu~K~#9!os(NgQ*j)}Kj&=erZ$hYk*7#(3o?udr2AMcyNK0O zVi$|9^R==@7bGaUM+HHJy+m{`4Jws_z=CcFCEYJ}ql>j_bJOiC-8rs#Kwb0_ec}6d zz8}87@1G;Y<8l5))obKIdC&73)JXJAKUpr%udejB1l3QGH-(y;BMH7W(hJZM0992H zMOa)o3IX&cuNte!wLGP`q67cW@0{J5Mkr+(x8JlRG8zD4PXkTUXpeRh?Nm_`e*e6d zywu~AZSCaU#{fsxn;|Wa#xD~vnau$7ouFxYgKz?H{@OiKWAE`yeogrwmGsVy0bDy}|6k^Hr2=0P(E;h{|f5dPK#=E+| z*PS$?hNh})TepG(-l3en{*|iJFDS_UOj)6k<$FYekp>(N2XCJ|peNHeqLv_PoormH zaqGq<_MXZjcc70Qn0SeudkjHE%(_&(u=Q~&L2%M;oVYAtAI-P_Hxr@e~noV!m<65F1LMku?h>?!UBhs3wg8QWnL<#e~D*UO*%g(SuP%(MJa`_A_N{uH0G0 ztg#mLY`xFuE-GdDN&^6aK!9X@X=wrCJZx%0G>Aa}DpnOO@|28obpMtA21 + + + File + + + Edit @@ -163,18 +169,23 @@ - - - File - - - - + + + + :/icons/exit.png:/icons/exit.png + + + Quit + + + Ctrl+Q + + @@ -266,30 +277,6 @@ View URL properties - - - - :/icons/save.png:/icons/save.png - - - Save... - - - Ctrl+S - - - - - - :/icons/exit.png:/icons/exit.png - - - Quit - - - Ctrl+Q - -