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

List:       kde-commits
Subject:    kdeutils/kcharselect
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-12-20 14:13:04
Message-ID: 20041220141304.1C9FC1C3CF () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

/me gives kcharselect some KDE3 lovin


  A            kcharselectui.rc   1.1
  M +3 -0      Makefile.am   1.15
  M +1 -0      TODO   1.5
  M +27 -40    kcharselectdia.cc   1.29


--- kdeutils/kcharselect/Makefile.am  #1.14:1.15
@@ -14,4 +14,7 @@
 xdg_apps_DATA = KCharSelect.desktop
 
+rcdir = $(kde_datadir)/kcharselect
+rc_DATA = kcharselectui.rc
+
 messages:
         $(XGETTEXT) $(kcharselect_SOURCES) -o $(podir)/kcharselect.pot 

--- kdeutils/kcharselect/TODO  #1.4:1.5
@@ -5,2 +5,3 @@
 o Should remove the useless "What's this?" widget from title bar.
 o Use a horizontal layout for "Clear", "To Clipboard", and the line edit.
+o Convert to KAction

--- kdeutils/kcharselect/kcharselectdia.cc  #1.28:1.29
@@ -20,5 +20,6 @@
 #include <kmenubar.h>
 #include <kstdguiitem.h>
-
+#include <kstdaction.h>
+#include <kaction.h>
 
 /******************************************************************/
@@ -83,46 +84,29 @@ KCharSelectDia::KCharSelectDia(QWidget *
 
   // Build menu
-  int id;
-  KAccel *keys = new KAccel( this );
+  KStdAction::quit( this, SLOT(_exit()), actionCollection() );
 
-  QPopupMenu *file = new QPopupMenu( this );
-  id = file->insertItem( SmallIcon( "exit" ), KStdGuiItem::quit().text(),
-            this, SLOT(_exit()));
-  keys->changeMenuAccel(file, id, KStdAccel::Quit);
+  new KAction(i18n("&To Clipboard"), "editcopy",
+         KStdAccel::shortcut(KStdAccel::Copy), this, SLOT(toClip()), \
actionCollection(), "copy_clip" );  
-  keys->insert( KStdAccel::Paste, this, SLOT(fromClip()));
-  keys->insert( KStdAccel::Copy , this, SLOT(toClip()));
-  keys->insert( KStdAccel::Quit , this, SLOT(_exit()));
-  keys->insert( KStdAccel::Help , this, SLOT(help()));
+  (void)new KAction(i18n("To Clipboard &UTF-8"), 0, this,
+    SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" );
+  (void)new KAction(i18n("To Clipboard &HTML"), 0, this,
+      SLOT(toClipHTML()), actionCollection(), "copy_html" );
+ 
+  new KAction(i18n("&From Clipboard"), "editpaste",
+         KStdAccel::shortcut(KStdAccel::Paste), this, SLOT(fromClip()), \
actionCollection(), "from_clip" ); +  (void)new KAction(i18n("From Clipboard UTF-8"), \
0, this, +      SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" );
 
-  QPopupMenu *edit = new QPopupMenu( this );
-  id = edit->insertItem( SmallIcon( "editcopy" ), i18n("&To Clipboard"),
-            this, SLOT(toClip()) );
-  keys->changeMenuAccel(edit, id, KStdAccel::Copy);
-  id = edit->insertItem( i18n("To Clipboard &UTF-8"),
-            this, SLOT(toClipUTF8()) );
-  id = edit->insertItem( i18n("To Clipboard &HTML"),
-            this, SLOT(toClipHTML()) );
-  id = edit->insertItem( SmallIcon( "editpaste"), i18n("From Clipboard"),
-            this, SLOT(fromClip()) );
-  keys->changeMenuAccel(edit, id, KStdAccel::Paste);
-  id = edit->insertItem( i18n("From Clipboard UTF-8"),
-            this, SLOT(fromClipUTF8()) );
   i18n("From Clipboard HTML");      // Intended for future use
-  id = edit->insertSeparator();
-  id = edit->insertItem( SmallIcon( "locationbar_erase" ), \
                KStdGuiItem::clear().text(),
-            this, SLOT(clear())     );
-  id = edit->insertItem( i18n("&Flip"), this, SLOT(flipText())  );
-  id = edit->insertItem( i18n("&Alignment"),
-            this, SLOT(toggleEntryDirection()) );
 
-  menuBar()->insertItem( i18n("&File"), file );
-  menuBar()->insertItem( i18n("&Edit"), edit );
-  menuBar()->insertItem( KStdGuiItem::help().text(), helpMenu() );
+  KStdAction::clear(this, SLOT(clear()), actionCollection(), "clear");
+  (void)new KAction(i18n("&Flip"), 0, this,
+      SLOT(flipText()), actionCollection(), "flip" );
+  (void)new KAction(i18n("&Alignment"), 0, this,
+      SLOT(toggleEntryDirection()), actionCollection(), "alignment" );
 
   charSelect->setFocus();
 
-  resize(grid->sizeHint());
-
   entryDirection = direction;
   if( entryDirection )
@@ -130,4 +114,6 @@ KCharSelectDia::KCharSelectDia(QWidget *
   else
     lined->setAlignment( Qt::AlignLeft );
+
+  setupGUI();
 }
 


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