| 26f9facd | 2014-10-12 17:49:21 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M src/cuesheeteditor.cpp M src/filelist.cpp M src/logviewer.cpp M src/optionseditor.cpp M src/optionsrequester.cpp M src/replaygainscanner.cpp M src/soundkonverter.cpp |
||
diff --git a/src/cuesheeteditor.cpp b/src/cuesheeteditor.cpp
index e585657..70619f0 100755
--- a/src/cuesheeteditor.cpp
+++ b/src/cuesheeteditor.cpp
@@ -79,7 +79,7 @@
this, TQT_SLOT(generate())
);
- pConvert = new KPushButton( iconLoader->loadIcon("run",TDEIcon::Small), i18n("Format"), this, "pConvert" );
+ pConvert = new KPushButton( iconLoader->loadIcon("system-run",TDEIcon::Small), i18n("Format"), this, "pConvert" );
buttonBox->addWidget( pConvert );
connect( pConvert, TQT_SIGNAL(clicked()),
this, TQT_SLOT(convert())
@@ -93,7 +93,7 @@
buttonBox->addStretch();
- pOk = new KPushButton(iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Close"), this, "pOk" );
+ pOk = new KPushButton(iconLoader->loadIcon("system-log-out",TDEIcon::Small), i18n("Close"), this, "pOk" );
pOk->setFocus();
buttonBox->addWidget( pOk );
connect( pOk, TQT_SIGNAL(clicked()),
diff --git a/src/filelist.cpp b/src/filelist.cpp
index 0f327ab..abbce8d 100755
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -168,8 +168,8 @@
actionCollection = new TDEActionCollection( this );
edit = new TDEAction( i18n("Edit options ..."), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(showOptionsEditorDialog()), actionCollection, "edit_options" );
- start = new TDEAction( i18n("Start conversion"), "run", 0, TQT_TQOBJECT(this), TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" );
- stop = new TDEAction( i18n("Stop conversion"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" );
+ start = new TDEAction( i18n("Start conversion"), "system-run", 0, TQT_TQOBJECT(this), TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" );
+ stop = new TDEAction( i18n("Stop conversion"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" );
remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
paste = new TDEAction( i18n("Paste"), "editpaste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" ); // TODO paste
diff --git a/src/logviewer.cpp b/src/logviewer.cpp
index 8c6b09e..9406fa0 100755
--- a/src/logviewer.cpp
+++ b/src/logviewer.cpp
@@ -107,7 +107,7 @@
buttonBox->addStretch();
- pOk = new KPushButton(iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Close"), this, "pOk" );
+ pOk = new KPushButton(iconLoader->loadIcon("system-log-out",TDEIcon::Small), i18n("Close"), this, "pOk" );
pOk->setFocus();
buttonBox->addWidget( pOk );
connect( pOk, TQT_SIGNAL(clicked()),
diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp
index c730637..9e97c93 100755
--- a/src/optionseditor.cpp
+++ b/src/optionseditor.cpp
@@ -49,7 +49,7 @@
// setButtonGuiItem( User2, KGuiItem(i18n("Previous"),iconLoader->loadIconSet("go-previous",TDEIcon::Small,16,true/*KDE3.5,false*/)) );
// setButtonGuiItem( User1, KGuiItem(i18n("Next"),iconLoader->loadIconSet("go-next",TDEIcon::Small,16,true/*KDE3.5,false*/)) );
- setButtonGuiItem( Ok, KGuiItem(i18n("Close"),iconLoader->loadIconSet("exit",TDEIcon::Small,16,true/*KDE3.5,false*/)) );
+ setButtonGuiItem( Ok, KGuiItem(i18n("Close"),iconLoader->loadIconSet("system-log-out",TDEIcon::Small,16,true/*KDE3.5,false*/)) );
//// options page ////
conversionOptions = addPage( i18n("Conversion"), i18n("Conversion options"), iconLoader->loadIcon("soundkonverter",TDEIcon::Desktop) );
diff --git a/src/optionsrequester.cpp b/src/optionsrequester.cpp
index b789383..854921b 100755
--- a/src/optionsrequester.cpp
+++ b/src/optionsrequester.cpp
@@ -53,7 +53,7 @@
buttonBox->addStretch();
- pCancel = new KPushButton( iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Cancel"), this, "pCancel" );
+ pCancel = new KPushButton( iconLoader->loadIcon("system-log-out",TDEIcon::Small), i18n("Cancel"), this, "pCancel" );
buttonBox->addWidget( pCancel );
pOk = new KPushButton( iconLoader->loadIcon("apply",TDEIcon::Small), i18n("Ok"), this, "pOk" );
diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp
index ed183a4..af997f0 100755
--- a/src/replaygainscanner.cpp
+++ b/src/replaygainscanner.cpp
@@ -122,7 +122,7 @@
buttonBox->addStretch();
- pOk = new KPushButton( iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Close"), this, "pOk" );
+ pOk = new KPushButton( iconLoader->loadIcon("system-log-out",TDEIcon::Small), i18n("Close"), this, "pOk" );
pOk->setFocus();
buttonBox->addWidget( pOk );
connect( pOk, TQT_SIGNAL(clicked()),
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 79229c1..8a6d83b 100755
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -113,7 +113,7 @@
options = new Options( config, i18n("Choose your prefered output options and click on \"Add files ...\"!"), widget, "options" );
fileList = new FileList( cdManager, tagEngine, config, options, logger, widget, "fileList" );
- startAction = new TDEAction( i18n("&Start conversion"), "run", 0, TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()), actionCollection(), "start" );
+ startAction = new TDEAction( i18n("&Start conversion"), "system-run", 0, TQT_TQOBJECT(fileList), TQT_SLOT(startConversion()), actionCollection(), "start" );
startAction->setEnabled( false );
new TDEAction( i18n("&Replay Gain Tool ..."), "soundkonverter_replaygain", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(showReplayGainScanner()), actionCollection(), "replaygainscanner" );
//new TDEAction( i18n("R&epair Tool ..."), "soundkonverter_repair", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(showRepairTool()), actionCollection(), "repairtool" );
@@ -121,10 +121,10 @@
new TDEAction( i18n("Show &Log ..."), "view_text", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showLogViewer()), actionCollection(), "log" );
// new TDEAction( i18n("About &Plugins ..."), "connect_creating", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SLOT(showAboutPlugins()), actionCollection(), "about_plugins" );
- stopAction = new TDEAction( i18n("S&top after current file is complete"), "stop", CTRL+Key_O, TQT_TQOBJECT(fileList), TQT_SLOT(stopConversion()), actionCollection(), "stop" );
- continueAction = new TDEAction( i18n("&Continue after current file is complete"), "run", CTRL+Key_T, TQT_TQOBJECT(fileList), TQT_SLOT(continueConversion()), actionCollection(), "continue" );
- killAction = new TDEAction( i18n("Stop &immediately"), "exit", CTRL+Key_K, TQT_TQOBJECT(fileList), TQT_SLOT(killConversion()), actionCollection(), "kill" );
- stopActionMenu = new TDEActionMenu( i18n("Stop"), "stop", actionCollection(), "stopMenu" );
+ stopAction = new TDEAction( i18n("S&top after current file is complete"), "process-stop", CTRL+Key_O, TQT_TQOBJECT(fileList), TQT_SLOT(stopConversion()), actionCollection(), "stop" );
+ continueAction = new TDEAction( i18n("&Continue after current file is complete"), "system-run", CTRL+Key_T, TQT_TQOBJECT(fileList), TQT_SLOT(continueConversion()), actionCollection(), "continue" );
+ killAction = new TDEAction( i18n("Stop &immediately"), "system-log-out", CTRL+Key_K, TQT_TQOBJECT(fileList), TQT_SLOT(killConversion()), actionCollection(), "kill" );
+ stopActionMenu = new TDEActionMenu( i18n("Stop"), "process-stop", actionCollection(), "stopMenu" );
stopActionMenu->setDelayed( false );
stopActionMenu->setEnabled( false );
// stopActionMenu->insert( stopAction );
@@ -243,7 +243,7 @@
addBox->addSpacing( 18 );
- pStart = new KPushButton( iconLoader->loadIcon("run",TDEIcon::Small), i18n("Start"), widget, "pStart" );
+ pStart = new KPushButton( iconLoader->loadIcon("system-run",TDEIcon::Small), i18n("Start"), widget, "pStart" );
pStart->setFixedHeight( pStart->size().height() );
pStart->setEnabled( false );
addBox->addWidget( pStart );
@@ -251,7 +251,7 @@
TQT_TQOBJECT(fileList), TQT_SLOT(startConversion())
);
- pStop = new KPushButton( iconLoader->loadIcon("stop",TDEIcon::Small), i18n("Stop"), widget, "pStop" );
+ pStop = new KPushButton( iconLoader->loadIcon("process-stop",TDEIcon::Small), i18n("Stop"), widget, "pStop" );
pStop->setFixedHeight( pStop->size().height() );
pStop->hide();
pStop->setPopup( stopActionMenu->popupMenu() );
|
||
| 58fa1cb4 | 2014-10-12 17:54:58 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/soundkonverter |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |
||