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

List:       kde-commits
Subject:    kdeadmin/kuser
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2004-08-24 21:05:23
Message-ID: 20040824210523.84B4124E7 () office ! kde ! org
[Download RAW message or body]

CVS commit by gyurco: 

- Use KStdGuiItem::del()
- Added a new option - reload the user/group database


  M +1 -1      delUser.cpp   1.9
  M +4 -0      kuserui.rc   1.6
  M +4 -4      mainView.cpp   1.43
  M +8 -0      mainWidget.cpp   1.42
  M +1 -0      mainWidget.h   1.15


--- kdeadmin/kuser/delUser.cpp  #1.8:1.9
@@ -35,5 +35,5 @@ delUser::delUser(KUser *AUser, QWidget *
   QString mailboxpath = \
QString::fromLatin1("%1/%2").arg(QString::fromLatin1(MAIL_SPOOL_DIR)).arg(AUser->getName());
  m_deleteMailBox = new QCheckBox(i18n("Delete &mailbox: %1").arg(mailboxpath), \
                page);
-  setButtonGuiItem(KDialogBase::Ok, KGuiItem(i18n("&Delete"), \
QString::fromLatin1("editdelete")) ); +  setButtonGuiItem(KDialogBase::Ok, \
KStdGuiItem::del());  }
 

--- kdeadmin/kuser/kuserui.rc  #1.5:1.6
@@ -4,4 +4,5 @@
     <Menu name="file"><text>&amp;File</text>
       <Action name="select_conn"/>
+      <Action name="reload"/>
     </Menu>
                 <Menu name="user"><text>&amp;User</text>
@@ -28,4 +29,7 @@
                 <Action name="edit_group"/>
                 <Action name="delete_group"/>
+                <Separator/>
+    <Action name="reload"/>
+                <Separator/>
         </ToolBar>
 </kpartgui>

--- kdeadmin/kuser/mainView.cpp  #1.42:1.43
@@ -164,8 +164,8 @@ void mainView::userdel()
 
     if ( group &&
-      KMessageBox::warningContinueCancel( 0, i18n("You are using private groups.\n"
+      KMessageBox::questionYesNo( 0, i18n("You are using private groups.\n"
         "Do you want to delete the user's private group '%1'?")
         .arg(group->getName()), QString::null,
-        i18n("&Delete")) == KMessageBox::Continue) {
+        KStdGuiItem::del()) == KMessageBox::Yes) {
 
       kug->getGroups().del( group );
@@ -436,10 +436,10 @@ void mainView::grpdel()
       if (KMessageBox::warningContinueCancel( 0,
         i18n("Do you really want to delete the group '%1'?").arg(group->getName()),
-        QString::null, i18n("&Delete")) != KMessageBox::Continue) return;
+        QString::null, KStdGuiItem::del()) != KMessageBox::Continue) return;
       break;
     default:
       if (KMessageBox::warningContinueCancel( 0,
         i18n("Do you really want to delete the %1 selected groups?").arg(selected),
-        QString::null, i18n("&Delete")) != KMessageBox::Continue) return;
+        QString::null, KStdGuiItem::del()) != KMessageBox::Continue) return;
   }
 

--- kdeadmin/kuser/mainWidget.cpp  #1.41:1.42
@@ -97,4 +97,7 @@ void mainWidget::setupActions()
     SLOT(grpdel()), actionCollection(), "delete_group");
 
+  (void) new KAction(i18n("&Reload"), QIconSet(BarIconC("reload")), 0, this,
+    SLOT(reload()), actionCollection(), "reload");
+
 #undef BarIconC
         
@@ -126,4 +129,9 @@ void mainWidget::properties()
 }
 
+void mainWidget::reload()
+{
+  init();
+}
+
 void mainWidget::init()
 {

--- kdeadmin/kuser/mainWidget.h  #1.14:1.15
@@ -45,4 +45,5 @@ protected slots:
   void slotApplyConnection();
   void selectconn();
+  void reload();
 
 private:


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