commit d6a7c7d8e1b4c38688d82e269535ecc8bf21507d Author: Tomás Touceda <chiiph@torproject.org> Date: Sat Jul 21 16:13:30 2012 -0300 Add missing icons --- changes/icons | 2 ++ src/vidalia/MainWindow.cpp | 19 +++++++------------ src/vidalia/res/32x32/debug.png | Bin 0 -> 5495 bytes src/vidalia/res/32x32/debug.readme.txt | 7 +++++++ src/vidalia/res/32x32/hide.png | Bin 0 -> 281 bytes src/vidalia/res/32x32/hide.readme.txt | 7 +++++++ src/vidalia/res/32x32/reload.png | Bin 0 -> 3645 bytes src/vidalia/res/vidalia.qrc | 3 +++ 8 files changed, 26 insertions(+), 12 deletions(-) diff --git a/changes/icons b/changes/icons new file mode 100644 index 0000000..01641a7 --- /dev/null +++ b/changes/icons @@ -0,0 +1,2 @@ + Internal cleanups and improvements: + o Add missing icons. diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index e3cacb0..e40e3a3 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -59,6 +59,9 @@ #define IMG_ABOUT ":/images/16x16/help-about.png" #define IMG_EXIT ":/images/16x16/application-exit.png" #define IMG_NETWORK ":/images/16x16/applications-internet.png" +#define IMG_RELOAD ":/images/32x32/reload.png" +#define IMG_HIDE ":/images/32x32/hide.png" +#define IMG_DEBUG ":/images/32x32/debug.png" #define IMG_START_TOR_16 ":/images/16x16/media-playback-start.png" #define IMG_STOP_TOR_16 ":/images/16x16/media-playback-stop.png" @@ -203,8 +206,8 @@ void MainWindow::createActions() { _actionShowControlPanel = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Control Panel"), this); - _actionRestartTor = new QAction(tr("Restart"), this); - _actionReloadConfig = new QAction(tr("Reload Tor's config"), this); + _actionRestartTor = new QAction(QIcon(IMG_RELOAD), tr("Restart"), this); + _actionReloadConfig = new QAction(QIcon(IMG_RELOAD), tr("Reload Tor's config"), this); _actionNewIdentity = new QAction(QIcon(IMG_IDENTITY), tr("New Circuit"), this); _actionStatus = new QAction(QIcon(IMG_CONTROL_PANEL), tr("Status"), this); _actionNetworkMap = new QAction(QIcon(IMG_NETWORK), tr("Network Map"), this); @@ -215,9 +218,9 @@ MainWindow::createActions() _actionAbout = new QAction(QIcon(IMG_ABOUT), tr("About"), this); _actionStartStopTor = new QAction(QIcon(IMG_START_TOR_16), tr("Start Tor"), this); _actionExit = new QAction(QIcon(IMG_EXIT), tr("Exit"), this); - _actionDebugDialog = new QAction(tr("Debug output"), this); + _actionDebugDialog = new QAction(QIcon(IMG_DEBUG), tr("Debug output"), this); _actionPanic = new QAction(QIcon(IMG_EXIT), tr("Panic!"), this); - _actionHide = new QAction(tr("Hide"), this); + _actionHide = new QAction(QIcon(IMG_HIDE), tr("Hide"), this); if (QSystemTrayIcon::isSystemTrayAvailable()) { _actionHide->setShortcut(QKeySequence(tr("Ctrl+W"))); } @@ -2058,14 +2061,6 @@ MainWindow::delTab(int index) index = ui.tabWidget->currentIndex(); VidaliaTab *tab = qobject_cast<VidaliaTab*>(ui.tabWidget->widget(index)); - // if it isn't one of the tabs that's supposed to be open at every moment - if (tab != _messageLog && - tab != &_statusTab && - tab != &_netViewer && - tab != _graph) { - QObject::disconnect(ui.tabWidget->widget(index), 0, 0, 0); - tab->deleteLater(); - } ui.tabWidget->removeTab(index); QString key = _tabMap.at(index); _tabMap.removeAll(key); diff --git a/src/vidalia/res/32x32/debug.png b/src/vidalia/res/32x32/debug.png new file mode 100644 index 0000000..8c45d78 Binary files /dev/null and b/src/vidalia/res/32x32/debug.png differ diff --git a/src/vidalia/res/32x32/debug.readme.txt b/src/vidalia/res/32x32/debug.readme.txt new file mode 100644 index 0000000..49fe2e4 --- /dev/null +++ b/src/vidalia/res/32x32/debug.readme.txt @@ -0,0 +1,7 @@ +debug.png is a part of Phuzion icon pack + +Author: Asher +Web: http://kyo-tux.deviantart.com/ + +Distributed under license CC Attribution Share Alike +(http://creativecommons.org/licenses/by-sa/3.0/) diff --git a/src/vidalia/res/32x32/hide.png b/src/vidalia/res/32x32/hide.png new file mode 100644 index 0000000..0be644e Binary files /dev/null and b/src/vidalia/res/32x32/hide.png differ diff --git a/src/vidalia/res/32x32/hide.readme.txt b/src/vidalia/res/32x32/hide.readme.txt new file mode 100644 index 0000000..c5701f2 --- /dev/null +++ b/src/vidalia/res/32x32/hide.readme.txt @@ -0,0 +1,7 @@ +hide.png icon is a part of Picol icon pack + +Author: Melih Bilgil +Web: http://www.picol.org/ + +Distributed under CC Attribution Non-Commercial Share Alike +(http://creativecommons.org/licenses/by-nc-sa/3.0/) diff --git a/src/vidalia/res/32x32/reload.png b/src/vidalia/res/32x32/reload.png new file mode 100644 index 0000000..0662a45 Binary files /dev/null and b/src/vidalia/res/32x32/reload.png differ diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc index c1c52c7..333e839 100644 --- a/src/vidalia/res/vidalia.qrc +++ b/src/vidalia/res/vidalia.qrc @@ -97,6 +97,9 @@ <file>32x32/zoom-fit-best.png</file> <file>32x32/zoom-in.png</file> <file>32x32/zoom-out.png</file> + <file>32x32/hide.png</file> + <file>32x32/reload.png</file> + <file>32x32/debug.png</file> </qresource> <qresource prefix="/images"> <file>48x48/applications-internet.png</file>