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

List:       kde-commits
Subject:    kdeutils/kgpg
From:       Antonio Larrosa Jimenez <larrosa () kde ! org>
Date:       2003-08-27 22:30:22
[Download RAW message or body]

CVS commit by antlarr: 

Fixed the icons of the systray of kgpg.
Also, icons should be crystal icons, not hicolor.
And also, simplified the code everywhere a bit.
Fixed a bug since you almost never ever want to give the
pixmap you want to use to the constructor of a KAction.


  A            icons/.cvsignore   1.1
  A            icons/Makefile.am   1.1
  A            icons/cr16-action-kgpg_key1.png   1.1
  A            icons/cr16-action-kgpg_key2.png   1.1
  A            icons/cr16-action-kgpg_key3.png   1.1
  A            icons/cr16-app-kgpg.png   1.1
  A            icons/cr16-app-kgpg2.png   1.1
  A            icons/cr22-action-kgpg_edit.png   1.1
  A            icons/cr22-action-kgpg_export.png   1.1
  A            icons/cr22-action-kgpg_gen.png   1.1
  A            icons/cr22-action-kgpg_identity.png   1.1
  A            icons/cr22-action-kgpg_import.png   1.1
  A            icons/cr22-action-kgpg_info.png   1.1
  A            icons/cr22-action-kgpg_manage.png   1.1
  A            icons/cr22-action-kgpg_photo.png   1.1
  A            icons/cr22-action-kgpg_sign.png   1.1
  A            icons/cr22-app-kgpg.png   1.1
  A            icons/cr32-app-kgpg.png   1.1
  A            icons/cr48-app-kgpg.png   1.1
  M +1 -8      Makefile.am   1.34
  M +1 -1      kgpg.cpp   1.92
  M +2 -6      kgpgeditor.cpp   1.16
  M +0 -5      kgpgeditor.h   1.12
  R            hi16-action-kgpg_key1.png   1.3
  R            hi16-action-kgpg_key2.png   1.3
  R            hi16-action-kgpg_key3.png   1.2
  R            hi16-app-kgpg.png   1.1.1.1
  R            hi16-app-kgpg2.png   1.1.1.1
  R            hi22-action-kgpg_edit.png   1.2
  R            hi22-action-kgpg_export.png   1.2
  R            hi22-action-kgpg_gen.png   1.2
  R            hi22-action-kgpg_identity.png   1.2
  R            hi22-action-kgpg_import.png   1.2
  R            hi22-action-kgpg_info.png   1.2
  R            hi22-action-kgpg_manage.png   1.2
  R            hi22-action-kgpg_photo.png   1.2
  R            hi22-action-kgpg_sign.png   1.2
  R            hi32-app-kgpg.png   1.2
  R            hi48-app-kgpg.png   1.2
  R            kgpg.png   1.2


--- kdeutils/kgpg/Makefile.am  #1.33:1.34
@@ -8,12 +8,5 @@
 kgpg_LDADD   =  $(LIB_KIO) $(LIB_KABC) -lkutils -lkdeprint
 
-KDE_ICON =kgpg
-
-kgpg_ICON= kgpg_gen kgpg kgpg2 kgpg_edit kgpg_sign kgpg_info kgpg_import kgpg_export \
                kgpg_key3 kgpg_key2 kgpg_key1 kgpg_manage kgpg_photo kgpg_identity
-
-kgpgdir=$(kde_datadir)/kgpg/icons
-
-
-pics_DATA=kgpg.png kgpg_unknown.png kgpg_good.png kgpg_bad.png kgpg_anim.gif
+pics_DATA=kgpg_unknown.png kgpg_good.png kgpg_bad.png kgpg_anim.gif
 picsdir=$(kde_datadir)/kgpg/pics
 

--- kdeutils/kgpg/kgpg.cpp  #1.91:1.92
@@ -63,5 +63,5 @@ MyView::MyView( QWidget *parent, const c
                 KTipDialog::showTip(this, "kgpg/tips", true);
 
-        setPixmap(KGlobal::iconLoader()->loadIcon("kgpg",KIcon::User,22));
+        setPixmap( KSystemTray::loadIcon("kgpg"));
         resize(24,24);
         setAcceptDrops(true);

--- kdeutils/kgpg/kgpgeditor.cpp  #1.15:1.16
@@ -27,8 +27,4 @@ KgpgApp::KgpgApp(QWidget *parent, const 
         readOptions();
 
-        KIconLoader *loader = KGlobal::iconLoader();
-        fileEnc=loader->loadIcon("kgpg",KIcon::Small);
-        fileDec=loader->loadIcon("kgpg2",KIcon::Small);
-
         // call inits to invoke all other construction parts
         initActions();
@@ -90,6 +86,6 @@ void KgpgApp::initActions()
 
         fileSave = KStdAction::save(this, SLOT(slotFileSave()), actionCollection());
-        (void) new KAction(i18n("&Encrypt File..."), fileEnc, 0,this, \
                SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt");
-        (void) new KAction(i18n("&Decrypt File..."), fileDec, 0,this, \
SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); +        (void) new \
KAction(i18n("&Encrypt File..."), "kgpg", 0,this, SLOT(slotFilePreEnc()), \
actionCollection(),"file_encrypt"); +        (void) new KAction(i18n("&Decrypt \
File..."), "kgpg2", 0,this, SLOT(slotFilePreDec()), \
                actionCollection(),"file_decrypt");
         editUndo = KStdAction::undo(this, SLOT(slotundo()), actionCollection());
         editRedo = KStdAction::redo(this, SLOT(slotredo()), actionCollection());

--- kdeutils/kgpg/kgpgeditor.h  #1.11:1.12
@@ -26,5 +26,4 @@
 #include <qwidget.h>
 #include <qstring.h>
-#include <qpixmap.h>
 #include <qdragobject.h>
 #include <qwidgetlist.h>
@@ -32,10 +31,7 @@
 #include <kurl.h>
 #include <kpopupmenu.h>
-#include <kiconloader.h>
 #include <khelpmenu.h>
 #include <ksystemtray.h>
-#include <kfiledialog.h>
 #include <kdeversion.h>
-#include <kshred.h>
 
 #if (KDE_VERSION >= 310)
@@ -73,5 +69,4 @@ public:
         bool ascii,untrusted,hideid,pgpcomp,encryptfileto,tipofday;
         QString messages;
-        QPixmap fileEnc,fileDec;
         KgpgView *view;
 


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