[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/utils/gwenrename
From: Spiros Georgaras <sngeorgaras () otenet ! gr>
Date: 2008-01-04 22:21:38
Message-ID: 1199485298.687674.23676.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 757415 by sngeorgaras:
adding isons to dialogs' buttons
M +7 -1 Makefile.am
AM filefind.png
AM help.png
M +9 -3 initaskmode.ui
M +9 -0 initaskmode.ui.h
M +2 -2 inputdir.ui
AM khelpcenter.png
M +24 -2 main.cpp
M +8 -5 multiselecttool.ui
M +8 -0 multiselecttool.ui.h
M +5 -5 rename.ui
M +16 -6 rename.ui.h
M +8 -5 timestamp.ui
M +4 -0 timestamp.ui.h
--- trunk/playground/utils/gwenrename/Makefile.am #757414:757415
@@ -48,7 +48,10 @@
$(INSTALL_DATA) $(srcdir)/folder.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/folder.png $(INSTALL_DATA) \
$(srcdir)/locationbar_erase.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/locationbar_erase.png \
$(INSTALL_DATA) $(srcdir)/stop.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/stop.png
-
+ $(INSTALL_DATA) $(srcdir)/help.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/help.png + $(INSTALL_DATA) \
$(srcdir)/khelpcenter.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/khelpcenter.png \
+ $(INSTALL_DATA) $(srcdir)/khelpcenter.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/filefind.png +
uninstall-local:
-rm -f $(kde_datadir)/konqueror/servicemenus/konqgwenrename.desktop
-rm -f $(kde_datadir)/gwenview/tools/gwenrename.desktop
@@ -65,6 +68,9 @@
-rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/folder.png
-rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/locationbar_erase.png
-rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/stop.png
+ -rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/help.png
+ -rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/khelpcenter.png
+ -rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/filefind.png
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
** trunk/playground/utils/gwenrename/filefind.png #property svn:mime-type
+ application/octet-stream
** trunk/playground/utils/gwenrename/help.png #property svn:mime-type
+ application/octet-stream
--- trunk/playground/utils/gwenrename/initaskmode.ui #757414:757415
@@ -105,7 +105,7 @@
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>renameDir</cstring>
</property>
@@ -116,7 +116,7 @@
<string>Alt+F</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>renameFiles</cstring>
</property>
@@ -130,7 +130,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -193,7 +193,13 @@
<slot>renameDirClicked()</slot>
</slots>
<functions>
+ <function access="private" specifier="non virtual" \
returnType="int">init()</function> <function returnType="int">Result()</function>
</functions>
<layoutdefaults spacing="6" margin="11"/>
+<includehints>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+</includehints>
</UI>
--- trunk/playground/utils/gwenrename/initaskmode.ui.h #757414:757415
@@ -10,6 +10,11 @@
** destructor.
*****************************************************************************/
+int initAskMode::init(){
+ //Icon sets
+ //buttonOk->setIconSet(QIconSet(ic.Icon(12)));
+ //buttonCancel->setIconSet(QIconSet(ic.Icon(13)));
+}
int initAskMode::Result(){
return mResult;
@@ -26,3 +31,7 @@
mResult=2;
accept();
}
+
+
+
+
--- trunk/playground/utils/gwenrename/inputdir.ui #757414:757415
@@ -216,7 +216,7 @@
</property>
<widget class="QPushButton">
<property name="name">
- <cstring>pushButton4</cstring>
+ <cstring>buttonHelp</cstring>
</property>
<property name="text">
<string>&Help</string>
@@ -312,7 +312,7 @@
<slot>eraseLocationBar()</slot>
</connection>
<connection>
- <sender>pushButton4</sender>
+ <sender>buttonHelp</sender>
<signal>clicked()</signal>
<receiver>InputDir</receiver>
<slot>showHelp()</slot>
** trunk/playground/utils/gwenrename/khelpcenter.png #property svn:mime-type
+ application/octet-stream
--- trunk/playground/utils/gwenrename/main.cpp #757414:757415
@@ -97,12 +97,28 @@
picture=QStringList("16x16/actions/locationbar_erase.png");
picture+="gwenrename/icons/hicolor/16x16/actions/locationbar_erase.png";
dialogsIcons.loadIcon(picture,2);
-
+ picture=QStringList("16x16/actions/button_ok.png");
+ picture+="16x16/actions/apply.png";
+ picture+="gwenrename/icons/hicolor/16x16/actions/button_ok.png";
+ dialogsIcons.loadIcon(picture,3);
+ picture=QStringList("16x16/actions/button_cancel.png");
+ picture+="gwenrename/icons/hicolor/16x16/actions/button_cancel.png";
+ dialogsIcons.loadIcon(picture,4);
+ picture=QStringList("16x16/actions/filefind.png");
+ picture+="gwenrename/icons/hicolor/16x16/actions/filefind.png";
+ dialogsIcons.loadIcon(picture,5);
+ // khelpcenter is for all help buttons
+ picture=QStringList("16x16/apps/khelpcenter.png");
+ picture+="gwenrename/icons/hicolor/16x16/actions/khelpcenter.png";
+ dialogsIcons.loadIcon(picture,6);
if(argc<2){
inp=new InputDir();
inp->pix->setPixmap(dialogsIcons.Icon(0));
inp->btOpen->setPixmap(dialogsIcons.Icon(1));
- inp->eraseLocBar->setPixmap(dialogsIcons.Icon(2));
+ inp->eraseLocBar->setPixmap(dialogsIcons.Icon(2));
+ inp->buttonOk->setIconSet(QIconSet(dialogsIcons.Icon(3)));
+ inp->buttonCancel->setIconSet(QIconSet(dialogsIcons.Icon(4)));
+ inp->buttonHelp->setIconSet(QIconSet(dialogsIcons.Icon(6)));
if(inp->exec()){
askDir=inp->dir->currentText();
askResult=1;
@@ -121,6 +137,9 @@
inp->pix->setPixmap(dialogsIcons.Icon(0));
inp->btOpen->setPixmap(dialogsIcons.Icon(1));
inp->eraseLocBar->setPixmap(dialogsIcons.Icon(2));
+ inp->buttonOk->setIconSet(QIconSet(dialogsIcons.Icon(3)));
+ inp->buttonCancel->setIconSet(QIconSet(dialogsIcons.Icon(4)));
+ inp->buttonHelp->setIconSet(QIconSet(dialogsIcons.Icon(6)));
if(inp->exec()){
askDir=inp->dir->currentText();
askResult=1;
@@ -145,6 +164,9 @@
initAskMode *askMode=new initAskMode();
askMode->Message->setText(QString(i18n("<p>The folder <b>%1</b> is the only \
parameter passed to <b>GwenRename</b>.<br><br>Do you want to rename this folder, or \
the files contained in it?</p>")).arg(tmp)); \
askMode->pix->setPixmap(dialogsIcons.Icon(0)); \
+ askMode->renameDir->setIconSet(QIconSet(dialogsIcons.Icon(1))); \
+ askMode->renameFiles->setIconSet(QIconSet(dialogsIcons.Icon(5))); \
+ askMode->buttonCancel->setIconSet(QIconSet(dialogsIcons.Icon(4))); \
if(askMode->exec()){ askResult=askMode->Result();
askDir=tmp;
--- trunk/playground/utils/gwenrename/multiselecttool.ui #757414:757415
@@ -267,9 +267,9 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
- <cstring>pushButton3</cstring>
+ <cstring>buttonHelp</cstring>
</property>
<property name="text">
<string>&Help</string>
@@ -295,7 +295,7 @@
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -312,7 +312,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -350,7 +350,7 @@
<slot>eraseLocationBar()</slot>
</connection>
<connection>
- <sender>pushButton3</sender>
+ <sender>buttonHelp</sender>
<signal>clicked()</signal>
<receiver>multiSelTool</receiver>
<slot>showHelp()</slot>
@@ -389,5 +389,8 @@
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
</includehints>
</UI>
--- trunk/playground/utils/gwenrename/multiselecttool.ui.h #757414:757415
@@ -11,6 +11,8 @@
*****************************************************************************/
#include <qcheckbox.h>
+#include "iconload.h"
+
//#include <kconfigbase.h>
#include <kconfig.h>
#include <ktrader.h>
@@ -20,6 +22,8 @@
#define HISTORY_ITEMS 10
+extern iconload ic;
+
void multiSelTool::init(){
if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
// The editor is available, so lets use it.
@@ -27,6 +31,10 @@
connect( editRegExp, SIGNAL(clicked()), this, SLOT( slotEditRegExp() ) );
}else
regexpContentCb->setEnabled(false);
+ //Icon sets
+ buttonOk->setIconSet(QIconSet(ic.Icon(12)));
+ buttonCancel->setIconSet(QIconSet(ic.Icon(13)));
+ buttonHelp->setIconSet(QIconSet(ic.Icon(16)));
setCaption(caption()+" - GwenRename");
readHistory();
numOfHistoryItems=txtSelect->count();
--- trunk/playground/utils/gwenrename/rename.ui #757414:757415
@@ -156,7 +156,7 @@
<string>Shuffle directories</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>reRandomize</cstring>
</property>
@@ -810,7 +810,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>pTime</cstring>
</property>
@@ -1769,7 +1769,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonAbout</cstring>
</property>
@@ -1811,7 +1811,7 @@
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -1831,7 +1831,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
--- trunk/playground/utils/gwenrename/rename.ui.h #757414:757415
@@ -164,10 +164,15 @@
btSaveExt->setPixmap(ic.Icon(12));
btDelExt->setPixmap(ic.Icon(13));
+ //Icon sets
+ buttonOk->setIconSet(QIconSet(ic.Icon(12)));
+ buttonCancel->setIconSet(QIconSet(ic.Icon(13)));
+ buttonAbout->setIconSet(QIconSet(ic.Icon(15)));
+
View->addColumn( "",35);
View->header()->setResizeEnabled( FALSE, View->header()->count() - 1 );
- View->addColumn( i18n( "Original filename" ),300 );
- View->addColumn( i18n( "New filename" ) );
+ View->addColumn( i18n( "Original name" ),300 );
+ View->addColumn( i18n( "New name" ) );
View->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, \
(QSizePolicy::SizeType)7, 0, 255, View->sizePolicy().hasHeightForWidth() ) ); \
View->setMinimumSize( QSize( 0, 200 ) ); View->setFocusPolicy( KListView::NoFocus );
@@ -2245,10 +2250,15 @@
picture=QStringList("gwenrename/icons/hicolor/16x16/actions/stop.png");
picture+="16x16/actions/stop.png";
if( ic.loadIcon(picture,14)==-1) errorExists++;
-// picture=QStringList("16x16/actions/add.png");
-// if(ic.loadIcon(picture,11)==-1) errorExists++;
-// picture=QStringList("16x16/actions/remove.png");
-// if(ic.loadIcon(picture,12)==-1) errorExists++;
+ // help is for main windows about button
+ picture=QStringList("16x16/actions/help.png");
+ picture+="gwenrename/icons/hicolor/16x16/actions/help.png";
+ if( ic.loadIcon(picture,15)==-1) errorExists++;
+ // khelpcenter is for all help buttons
+ picture=QStringList("16x16/apps/khelpcenter.png");
+ picture+="gwenrename/icons/hicolor/16x16/actions/khelpcenter.png";
+ if( ic.loadIcon(picture,16)==-1) errorExists++;
+
if(errorExists==1) exitError(2);
else if(errorExists>1) exitError(3);
}
--- trunk/playground/utils/gwenrename/timestamp.ui #757414:757415
@@ -313,9 +313,9 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
- <cstring>pushButton3</cstring>
+ <cstring>buttonHelp</cstring>
</property>
<property name="text">
<string>&Help</string>
@@ -341,7 +341,7 @@
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -364,7 +364,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="KPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -438,7 +438,7 @@
<slot>kFormatActivated(int)</slot>
</connection>
<connection>
- <sender>pushButton3</sender>
+ <sender>buttonHelp</sender>
<signal>clicked()</signal>
<receiver>tStamp</receiver>
<slot>showHelp()</slot>
@@ -475,5 +475,8 @@
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>ktextbrowser.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+ <includehint>kpushbutton.h</includehint>
</includehints>
</UI>
--- trunk/playground/utils/gwenrename/timestamp.ui.h #757414:757415
@@ -118,6 +118,10 @@
kFormat->insertItem( "yyyy_MM_dd" );
kFormat->insertItem( i18n("Other...") );
kFormat->setSizeLimit(kFormat->count());
+ //Icon sets
+ buttonOk->setIconSet(QIconSet(ic.Icon(12)));
+ buttonCancel->setIconSet(QIconSet(ic.Icon(13)));
+ buttonHelp->setIconSet(QIconSet(ic.Icon(16)));
if(!checkFormat(tFormatDate)) GFormat->setEnabled(FALSE);
else getExampleDate();
readConfig( historyIndex );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic