[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeadmin/kuser
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-07-16 16:50:18
Message-ID: 20040716165018.92516126C1 () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

Fix a bunch of little bugs by letting KMainWindow handle stuff
-Toolbar hiding/showing saving
-default size being incorrect
-saved size being incorrect for different sized screens
-using kmainwindow's statusbar
-Let KMainWindow handle toolbar configuring


  M +8 -66     mainWidget.cpp   1.40
  M +3 -19     mainWidget.h   1.14


--- kdeadmin/kuser/mainWidget.cpp  #1.39:1.40
@@ -36,4 +36,6 @@
 #include "editDefaults.h"
 #include "mainWidget.h"
+#include "selectconn.h"
+#include "mainView.h"
 
 mainWidget::mainWidget(const char *name) : KMainWindow(0,name)
@@ -46,19 +48,16 @@ mainWidget::mainWidget(const char *name)
   md->slotTabChanged();
 
-  sbar = new KStatusBar(this);
-  sbar->insertItem(i18n("Reading configuration"), 0);
+  statusBar()->insertItem(i18n("Reading configuration"), 0);
 
   setCentralWidget(md);
 
-  resize(500, 400);
-  readSettings();
-  sbar->changeItem(i18n("Ready"), 0);
+  setupGUI();
+        
+  statusBar()->changeItem(i18n("Ready"), 0);
 }
 
 mainWidget::~mainWidget()
 {
-  writeSettings();
   delete md;
-  delete sbar;
 }
 
@@ -72,11 +71,6 @@ void mainWidget::setupActions()
   KStdAction::quit(this, SLOT(close()), actionCollection());
   KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
-  KStdAction::configureToolbars(this, SLOT(slotConfigureToolbars()), actionCollection());
 
   KStdAction::preferences(this, SLOT(properties()), actionCollection());
-  mActionToolbar = KStdAction::showToolbar(this, SLOT(toggleToolBar()), actionCollection());
-  mActionStatusbar = KStdAction::showStatusbar(this, SLOT(toggleStatusBar()), actionCollection());
-
-//  KStdAction::saveOptions(md, SLOT(writeSettings()), actionCollection());
 
 #define BarIconC(x)     BarIcon(QString::fromLatin1(x))
@@ -103,4 +97,6 @@ void mainWidget::setupActions()
     SLOT(grpdel()), actionCollection(), "delete_group");
 
+#undef BarIconC
+        
   (void) new KAction(i18n("&Select Connection..."),
     0, this,
@@ -111,58 +107,4 @@ void mainWidget::setupActions()
     SLOT(showSys()), actionCollection(), "show_sys");
   mShowSys->setCheckedState(i18n("Hide System Users/Groups"));
-
-  createGUI(QString::fromLatin1("kuserui.rc"));
-}
-
-void mainWidget::slotConfigureToolbars()
-{
-    saveMainWindowSettings(KGlobal::config(), "MainWindow");
-    KEditToolbar dlg( actionCollection(),"kuserui.rc" );
-    connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(saveToolbarConfig()));
-    dlg.exec();
-}
-
-/**
- * Save new toolbarconfig.
- */
-void mainWidget::saveToolbarConfig()
-{
-    createGUI("kuserui.rc");
-    applyMainWindowSettings(KGlobal::config(), "MainWindow");
-}
-
-void mainWidget::readSettings()
-{
-  QValueList<int> geom = kug->kcfg()->geometry();
-  if ( geom.size() < 2 ) return;
-  int width = geom[0];
-  int height = geom[1];
-  if ( width && height ) resize(width, height);
-}
-
-void mainWidget::writeSettings()
-{
-  kdDebug() << "mainWidget::writeSettings() width=" << width() << " height: " << height() << endl;
-  QValueList<int> geom;
-  geom.append( width() );
-  geom.append( height() );
-
-  kug->kcfg()->setGeometry( geom );
-}
-
-void mainWidget::toggleToolBar()
-{
-  if (mActionToolbar->isChecked())
-    toolBar("mainToolBar")->show();
-  else
-    toolBar("mainToolBar")->hide();
-}
-
-void mainWidget::toggleStatusBar()
-{
-  if (mActionStatusbar->isChecked())
-    statusBar()->show();
-  else
-    statusBar()->hide();
 }
 

--- kdeadmin/kuser/mainWidget.h  #1.13:1.14
@@ -22,14 +22,9 @@
 #define _KU_MAINWIDGET_H
 
-#include <qevent.h>
-#include <qpixmap.h>
-
 #include <kmainwindow.h>
 
-#include "selectconn.h"
-#include "mainView.h"
-
+class SelectConn;
+class mainView;
 class KToggleAction;
-class KStatusBar;
 
 class mainWidget : public KMainWindow {
@@ -44,10 +38,6 @@ protected:
   void init();
   void setupActions();
-  void readSettings();
-  void writeSettings();
 
 protected slots:
-  void toggleToolBar();
-  void toggleStatusBar();
   void showSys();
   void properties();
@@ -55,13 +45,6 @@ protected slots:
   void slotApplyConnection();
   void selectconn();
-  void slotConfigureToolbars();
-  void saveToolbarConfig();
 
 private:
-//  KMenuBar   *menubar;
-//  KToolBar   *toolbar;
-  KStatusBar *sbar;
-  KToggleAction *mActionToolbar;
-  KToggleAction *mActionStatusbar;
   KToggleAction *mShowSys;
   mainView *md;


[prev in list] [next in list] [prev in thread] [next in thread]