f5c0bb0b | 2014-10-12 17:50:58 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
M korundum/rubylib/examples/kludgeror.rb M korundum/rubylib/examples/systray.rb M korundum/rubylib/templates/annotated/systray1.rb M korundum/rubylib/templates/basic/systray1.rb M korundum/rubylib/tutorials/p7/p7.rb M qtruby/rubylib/examples/base/kicons.rb |
||
diff --git a/korundum/rubylib/examples/kludgeror.rb b/korundum/rubylib/examples/kludgeror.rb index 5bf2b4a..156b2c5 100644 --- a/korundum/rubylib/examples/kludgeror.rb +++ b/korundum/rubylib/examples/kludgeror.rb @@ -104,7 +104,7 @@ end a1 = KDE::Action.new( "Reload", "reload", KDE::Shortcut.new(TQt::Key_F5), ph, SLOT("reload()"), doc.actionCollection, "reload" ) -a2 = KDE::Action.new( "Exit", "exit", KDE::Shortcut.new(0), a, SLOT("quit()"), doc.actionCollection, "exit" ) +a2 = KDE::Action.new( "Exit", "system-log-out", KDE::Shortcut.new(0), a, SLOT("quit()"), doc.actionCollection, "exit" ) toplevel.guiFactory.addClient doc diff --git a/korundum/rubylib/examples/systray.rb b/korundum/rubylib/examples/systray.rb index b1517a2..f952bb5 100644 --- a/korundum/rubylib/examples/systray.rb +++ b/korundum/rubylib/examples/systray.rb @@ -57,7 +57,7 @@ icons = KDE::IconLoader.new() systray = KDE::SystemTray.new(mainWindow) -systray.setPixmap(icons.loadIcon("stop", 0)) +systray.setPixmap(icons.loadIcon("process-stop", 0)) systray.show() #mainWindow.show() diff --git a/korundum/rubylib/templates/annotated/systray1.rb b/korundum/rubylib/templates/annotated/systray1.rb index 15ab232..10bdb5c 100644 --- a/korundum/rubylib/templates/annotated/systray1.rb +++ b/korundum/rubylib/templates/annotated/systray1.rb @@ -59,7 +59,7 @@ # KDE::SystemTray hides or shows its parent when the system tray icon is clicked systray = KDE::SystemTray.new(self) - systray.setPixmap(icons.loadIcon("stop", 0)) + systray.setPixmap(icons.loadIcon("process-stop", 0)) connect(systray, SIGNAL("quitSelected()"), self, SLOT('slotQuitSelected()')) systray.show() end diff --git a/korundum/rubylib/templates/basic/systray1.rb b/korundum/rubylib/templates/basic/systray1.rb index b1e5e09..b3a9115 100644 --- a/korundum/rubylib/templates/basic/systray1.rb +++ b/korundum/rubylib/templates/basic/systray1.rb @@ -44,7 +44,7 @@ icons = KDE::IconLoader.new() systray = KDE::SystemTray.new(self) - systray.setPixmap(icons.loadIcon("stop", 0)) + systray.setPixmap(icons.loadIcon("process-stop", 0)) connect(systray, SIGNAL("quitSelected()"), self, SLOT('slotQuitSelected()')) systray.show() end diff --git a/korundum/rubylib/tutorials/p7/p7.rb b/korundum/rubylib/tutorials/p7/p7.rb index 6c73c9c..d567c22 100644 --- a/korundum/rubylib/tutorials/p7/p7.rb +++ b/korundum/rubylib/tutorials/p7/p7.rb @@ -47,7 +47,7 @@ toolbar.insertButton(icons.loadIcon("back", KDE::Icon::Toolbar), TOOLBAR_ID_BACK, SIGNAL('clicked(int)'),self,SLOT('gotoPreviousPage()'), false, i18n("Back to previous page")) - toolbar.insertButton(icons.loadIcon("exit", KDE::Icon::Toolbar), TOOLBAR_ID_QUIT, + toolbar.insertButton(icons.loadIcon("system-log-out", KDE::Icon::Toolbar), TOOLBAR_ID_QUIT, SIGNAL('clicked(int)'),$kapp,SLOT('quit()'),true, i18n("Quit the application")) addToolBar(toolbar) diff --git a/qtruby/rubylib/examples/base/kicons.rb b/qtruby/rubylib/examples/base/kicons.rb index 3a8ebd6..5d201c0 100644 --- a/qtruby/rubylib/examples/base/kicons.rb +++ b/qtruby/rubylib/examples/base/kicons.rb @@ -47,7 +47,7 @@ Icons::FILE_CLOSE => "fileclose", Icons::FILE_SAVE => "filesave", Icons::FILE_SAVE_AS => "filesaveas", - Icons::EXIT => "exit" + Icons::EXIT => "system-log-out" } } $kIcons = TDEIconCollection.new(icon_collections) |
||
32313c05 | 2014-10-12 17:56:42 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebindings |
||
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |