[Pyamp-cvs] pyamp/src mainwindow.py,1.2,1.3 mainwindow.pyc,1.2,1.3

[<sa...@us...>]

Update of /cvsroot/pyamp/pyamp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6989/src

Modified Files:
	mainwindow.py mainwindow.pyc 
Log Message:
Added options to show/hide menu, toolbar, and sliderbar


Index: mainwindow.py
===================================================================
RCS file: /cvsroot/pyamp/pyamp/src/mainwindow.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mainwindow.py	15 Sep 2003 11:38:13 -0000	1.2
--- mainwindow.py	20 Sep 2003 13:20:51 -0000	1.3
***************
*** 78,86 ****
          self.playList.load()
          
!         self.setupActions()
!         self.setupMenus()
!         self.setupBars()
!         self.setupConnections()
!         
          self.setCentralWidget(self.playList)
          self.setCaption("Pyamp")
--- 78,82 ----
          self.playList.load()
          
!         self.config.setGroup("window")
          self.setCentralWidget(self.playList)
          self.setCaption("Pyamp")
***************
*** 89,93 ****
          # the mainwindow small enough.
          self.layout().setResizeMode(QLayout.FreeResize)
-         self.config.setGroup("window")
          self.move(self.config.readPointEntry("pos", QPoint(400, 100)))
          self.applyMainWindowSettings(self.config)
--- 85,88 ----
***************
*** 97,100 ****
--- 92,100 ----
              self.resize(227, 454)
              self.moveDockWindow(self.sliderBar, Qt.DockBottom)
+         
+         self.setupActions()
+         self.setupMenus()
+         self.setupBars()
+         self.setupConnections()
          self.show()
      
***************
*** 259,262 ****
--- 259,280 ----
                                           "invert")
          
+         self.actions["showMenu"] = KToggleAction(qApp.translate("MainWindow", "Show Menu"),
+                                                  "",
+                                                  KShortcut(self.readConfigEntry("showMenu")),
+                                                  self.actionCollection,
+                                                  "showMenu")
+         
+         self.actions["showMainBar"] = KToggleAction(qApp.translate("MainWindow", "Show Toolbar"),
+                                                  "",
+                                                  KShortcut(self.readConfigEntry("showMainBar")),
+                                                  self.actionCollection,
+                                                  "showMainBar")
+         
+         self.actions["showSliderBar"] = KToggleAction(qApp.translate("MainWindow", "Show Sliderbar"),
+                                                  "",
+                                                  KShortcut(self.readConfigEntry("showSliderBar")),
+                                                  self.actionCollection,
+                                                  "showSliderBar")
+         
          self.actions["exit"] = KAction(qApp.translate("MainWindow", "Exit"),
                                         "exit",
***************
*** 270,273 ****
--- 288,294 ----
          self.actions["repeat"].setChecked(self.playList.isRepeat())
          self.actions["target"].setChecked(self.playList.isTarget())
+         self.actions["showMenu"].setChecked(self.menu.isShown())
+         self.actions["showMainBar"].setChecked(self.mainBar.isShown())
+         self.actions["showSliderBar"].setChecked(self.sliderBar.isShown())
          
          self.actions["bindKey"] = KStdAction.keyBindings(self.showKeyDialog, self.actionCollection)
***************
*** 316,319 ****
--- 337,344 ----
          self.actions["invert"].plug(self.contextMenu)
          self.contextMenu.insertSeparator()
+         self.actions["showMenu"].plug(self.contextMenu)
+         self.actions["showMainBar"].plug(self.contextMenu)
+         self.actions["showSliderBar"].plug(self.contextMenu)
+         self.contextMenu.insertSeparator()
          self.actions["remove"].plug(self.contextMenu)
          
***************
*** 405,408 ****
--- 430,445 ----
                       SIGNAL("toggled(bool)"),
                       self.playList.setTarget)
+         
+         self.connect(self.actions["showMenu"],
+                      SIGNAL("toggled(bool)"),
+                      self.menu.setShown)
+         
+         self.connect(self.actions["showMainBar"],
+                      SIGNAL("toggled(bool)"),
+                      self.mainBar.setShown)
+         
+         self.connect(self.actions["showSliderBar"],
+                      SIGNAL("toggled(bool)"),
+                      self.sliderBar.setShown)
      
      def readConfigEntry(self, key, default=QString.null):

Index: mainwindow.pyc
===================================================================
RCS file: /cvsroot/pyamp/pyamp/src/mainwindow.pyc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvswyrfY8 and /tmp/cvs25q0C7 differ