- tor-commits - lists.torproject.org

[vidalia/alpha] First phase of detach tabs
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit 6dcf75a834e65715a1d3cd90664be377f3312c60 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Mon May 23 14:05:14 2011 -0300 First phase of detach tabs Commentted is the code that handles drag and drop for re-attaching the tabs again. It will probably work on windows, but I need to figure out a way to handle this in a generic way first, and then go for the ifdefs. --- src/vidalia/CMakeLists.txt | 2 + src/vidalia/MainWindow.cpp | 57 ++++++++++++++++++++++++++++++++++++++++- src/vidalia/MainWindow.h | 8 ++++++ src/vidalia/VAttachButton.cpp | 39 ++++++++++++++++++++++++++++ src/vidalia/VAttachButton.h | 30 +++++++++++++++++++++ src/vidalia/VTabWidget.cpp | 9 +++++- src/vidalia/VTabWidget.h | 3 ++ src/vidalia/VidaliaTab.cpp | 18 +++++++++++++ src/vidalia/VidaliaTab.h | 6 ++++ 9 files changed, 169 insertions(+), 3 deletions(-) diff --git a/src/vidalia/CMakeLists.txt b/src/vidalia/CMakeLists.txt index f340b65..9fd58ca 100644 --- a/src/vidalia/CMakeLists.txt +++ b/src/vidalia/CMakeLists.txt @@ -176,6 +176,7 @@ set(vidalia_SRCS ${vidalia_SRCS} Vidalia.cpp LanguageSupport.cpp VTabWidget.cpp + VAttachButton.cpp MainWindow.cpp VidaliaWindow.cpp VMessageBox.cpp @@ -187,6 +188,7 @@ set(vidalia_SRCS ${vidalia_SRCS} qt4_wrap_cpp(vidalia_SRCS Vidalia.h VTabWidget.h + VAttachButton.h MainWindow.h VidaliaWindow.h VMessageBox.h diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 56b24c7..22949b0 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -25,6 +25,7 @@ #include "ServerSettings.h" #include "AboutDialog.h" #include "HelpBrowser.h" +#include "VAttachButton.h" #ifdef USE_AUTOUPDATE #include "UpdatesAvailableDialog.h" #endif @@ -112,6 +113,8 @@ MainWindow::MainWindow() _status = Unset; _isVidaliaRunningTor = false; updateTorStatus(Stopped); + + setAcceptDrops(true); } /** Destructor */ @@ -1497,6 +1500,44 @@ MainWindow::handleCloseTab(int index) } void +MainWindow::attachTab() +{ + qWarning() << "ATTACHHHHHHHHHH"; +} + +void +MainWindow::dettachTab() +{ + VAttachButton *but = qobject_cast<VAttachButton *>(sender()); + VidaliaTab *tab = but->getTab(); + int index = ui.tabWidget->indexOf(tab); + + ui.tabWidget->removeTab(index); + tab->setParent(0); + tab->show(); + + QString key = _tabMap.at(index); + _tabMap.removeAll(key); + _dettachedTabMap << key; +} + +void +MainWindow::handleAttachedClose() +{ + VidaliaTab *tab = qobject_cast<VidaliaTab *>(sender()); + int index = ui.tabWidget->indexOf(tab); + qWarning() << index; + if(index < 0) { + qWarning() << "DETACHEEEEDDDDDDDDDDDDD"; + tab->setParent(ui.tabWidget); + addTab(tab); + delTab(ui.tabWidget->currentIndex()); + } else { + qWarning() << "ATTACHEEEEEDDDD"; + } +} + +void MainWindow::addTab(VidaliaTab *tab) { /** If the tab's already open, display it and delete the @@ -1518,8 +1559,22 @@ MainWindow::addTab(VidaliaTab *tab) return; } + VAttachButton *atb = new VAttachButton(); + ui.tabWidget->addTab(tab, tab->getTitle()); - ui.tabWidget->setCurrentIndex(ui.tabWidget->count() - 1); + int pos = ui.tabWidget->count() - 1; + ui.tabWidget->setCurrentIndex(pos); + + atb->setTab(tab); + ui.tabWidget->setTabButton(pos, QTabBar::LeftSide, atb); + + connect(tab, SIGNAL(closeTab()), + this, SLOT(handleAttachedClose())); + + connect(atb, SIGNAL(attachTab()), + this, SLOT(attachTab())); + connect(atb, SIGNAL(dettachTab()), + this, SLOT(dettachTab())); /** The new tab is added to the last position */ _tabMap << tab->getTitle(); connect(tab, SIGNAL(helpRequested(QString)), diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index 3b7d544..2bfd02f 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -60,6 +60,10 @@ protected: /** Called when the user changes the UI translation. */ virtual void retranslateUi(); +// void dropEvent(QDropEvent *de); +// void dragMoveEvent(QDragMoveEvent *de); +// void dragEnterEvent(QDragEnterEvent *event); + private slots: /** Respond to a double-click on the tray icon by opening the Control Panel * window. */ @@ -147,6 +151,9 @@ private slots: /** Deletes the tab at index if it exists and it isn't the Status tab */ void delTab(int index = -1); + void attachTab(); + void dettachTab(); + #if defined(USE_AUTOUPDATE) /** Called when the user clicks the 'Check Now' button in the General * settings page. */ @@ -283,6 +290,7 @@ private: MessageLog *_messageLog; /**< Message log that displays a more detailed log from Tor */ NetViewer _netViewer; /**< Network map that draws circuits */ QStringList _tabMap; /**< Map to handle opened tabs */ + QStringList _dettachedTabMap; BandwidthGraph *_graph; /**< Graph that draws bandwidth usage */ PluginEngine *_engine; diff --git a/src/vidalia/VAttachButton.cpp b/src/vidalia/VAttachButton.cpp new file mode 100644 index 0000000..80e512b --- /dev/null +++ b/src/vidalia/VAttachButton.cpp @@ -0,0 +1,39 @@ +#include "VAttachButton.h" + +VAttachButton::VAttachButton(QWidget *parent) : + QPushButton(parent) +{ + _tab = 0; + _attached = true; + setText(QString("X")); +} + +VAttachButton::~VAttachButton() +{ + disconnect(0,0,0,0); +} + +void +VAttachButton::setTab(VidaliaTab *tab) +{ + _tab = tab; + connect(this, SIGNAL(clicked()), this, SLOT(toggleAttach())); +} + +VidaliaTab * +VAttachButton::getTab() +{ + return _tab; +} + +void +VAttachButton::toggleAttach() +{ + if(_attached) { + emit dettachTab(); + } else { + emit attachTab(); + } + _attached = !_attached; +} + diff --git a/src/vidalia/VAttachButton.h b/src/vidalia/VAttachButton.h new file mode 100644 index 0000000..e1ad3de --- /dev/null +++ b/src/vidalia/VAttachButton.h @@ -0,0 +1,30 @@ +#ifndef VATTACHBUTTON_H +#define VATTACHBUTTON_H + +#include <QtGui> + +#include "VidaliaTab.h" + +class VAttachButton : public QPushButton { + Q_OBJECT + + public: + VAttachButton(QWidget *parent = 0); + ~VAttachButton(); + + void setTab(VidaliaTab *tab); + VidaliaTab *getTab(); + + signals: + void attachTab(); + void dettachTab(); + + public slots: + void toggleAttach(); + + private: + VidaliaTab *_tab; + bool _attached; +}; + +#endif diff --git a/src/vidalia/VTabWidget.cpp b/src/vidalia/VTabWidget.cpp index 421f069..a1bef76 100644 --- a/src/vidalia/VTabWidget.cpp +++ b/src/vidalia/VTabWidget.cpp @@ -1,5 +1,3 @@ -#include <QTabBar> - #include "VTabWidget.h" #include "VidaliaTab.h" @@ -50,3 +48,10 @@ VTabWidget::retranslateUi() setTabText(i, qobject_cast<VidaliaTab *>(widget(i))->getTitle()); } } + +void +VTabWidget::setTabButton(int pos, QTabBar::ButtonPosition butpos, QWidget *w) +{ + tabBar()->setTabButton(pos, butpos, w); +} + diff --git a/src/vidalia/VTabWidget.h b/src/vidalia/VTabWidget.h index c3eb8ce..45028e8 100644 --- a/src/vidalia/VTabWidget.h +++ b/src/vidalia/VTabWidget.h @@ -17,6 +17,7 @@ #define _VTABWIDGET_H #include <QTabWidget> +#include <QTabBar> class VTabWidget : public QTabWidget { @@ -31,6 +32,8 @@ public: /** Makes the tab at position unclosable */ void pinTab(int position); + void setTabButton(int pos, QTabBar::ButtonPosition butpos, QWidget *w); + protected: void changeEvent(QEvent *e); void retranslateUi(); diff --git a/src/vidalia/VidaliaTab.cpp b/src/vidalia/VidaliaTab.cpp index ec5f1bf..a35838e 100644 --- a/src/vidalia/VidaliaTab.cpp +++ b/src/vidalia/VidaliaTab.cpp @@ -64,3 +64,21 @@ VidaliaTab::setOnTop(bool top) { _onTop = top; } + +void +VidaliaTab::closeEvent(QCloseEvent *event) +{ + event->ignore(); + emit closeTab(); +} + +//void +//VidaliaTab::mouseMoveEvent(QMouseEvent *event) +//{ +// QDrag *dr = new QDrag(this); +// QMimeData *data = new QMimeData(); +// qWarning() << "THIS" << this; +// data->setData(tr("vidalia/pointer"), QByteArray().setNum((int)this)); +// dr->setMimeData(data); +// dr->start(); +//} diff --git a/src/vidalia/VidaliaTab.h b/src/vidalia/VidaliaTab.h index ac6edb1..df26c8a 100644 --- a/src/vidalia/VidaliaTab.h +++ b/src/vidalia/VidaliaTab.h @@ -51,6 +51,8 @@ signals: * <b>topic</b>. */ void helpRequested(const QString &topic); + void closeTab(); + protected: /** Reimplement the windows' changeEvent() method to check if the event * is a QEvent::LanguageChange event. If so, call retranslateUi(), which @@ -59,6 +61,10 @@ protected: /** Called when the user wants to change the currently visible language. */ virtual void retranslateUi(); + virtual void closeEvent(QCloseEvent *event); + +// virtual void mouseMoveEvent(QMouseEvent *event); + bool _onTop; /**< True if the current tab is the one being displayed */ private:

1 0

[vidalia/alpha] Fix typo: It's detach, not dettach
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit 2e4fbffbe0e0593712e964f5710a6c970195514b Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Mon May 23 14:07:49 2011 -0300 Fix typo: It's detach, not dettach --- src/vidalia/MainWindow.cpp | 8 ++++---- src/vidalia/MainWindow.h | 4 ++-- src/vidalia/VAttachButton.cpp | 2 +- src/vidalia/VAttachButton.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 22949b0..6e16ee4 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1506,7 +1506,7 @@ MainWindow::attachTab() } void -MainWindow::dettachTab() +MainWindow::detachTab() { VAttachButton *but = qobject_cast<VAttachButton *>(sender()); VidaliaTab *tab = but->getTab(); @@ -1518,7 +1518,7 @@ MainWindow::dettachTab() QString key = _tabMap.at(index); _tabMap.removeAll(key); - _dettachedTabMap << key; + _detachedTabMap << key; } void @@ -1573,8 +1573,8 @@ MainWindow::addTab(VidaliaTab *tab) connect(atb, SIGNAL(attachTab()), this, SLOT(attachTab())); - connect(atb, SIGNAL(dettachTab()), - this, SLOT(dettachTab())); + connect(atb, SIGNAL(detachTab()), + this, SLOT(detachTab())); /** The new tab is added to the last position */ _tabMap << tab->getTitle(); connect(tab, SIGNAL(helpRequested(QString)), diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index 2bfd02f..722a217 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -152,7 +152,7 @@ private slots: void delTab(int index = -1); void attachTab(); - void dettachTab(); + void detachTab(); #if defined(USE_AUTOUPDATE) /** Called when the user clicks the 'Check Now' button in the General @@ -290,7 +290,7 @@ private: MessageLog *_messageLog; /**< Message log that displays a more detailed log from Tor */ NetViewer _netViewer; /**< Network map that draws circuits */ QStringList _tabMap; /**< Map to handle opened tabs */ - QStringList _dettachedTabMap; + QStringList _detachedTabMap; BandwidthGraph *_graph; /**< Graph that draws bandwidth usage */ PluginEngine *_engine; diff --git a/src/vidalia/VAttachButton.cpp b/src/vidalia/VAttachButton.cpp index 80e512b..42a4b3e 100644 --- a/src/vidalia/VAttachButton.cpp +++ b/src/vidalia/VAttachButton.cpp @@ -30,7 +30,7 @@ void VAttachButton::toggleAttach() { if(_attached) { - emit dettachTab(); + emit detachTab(); } else { emit attachTab(); } diff --git a/src/vidalia/VAttachButton.h b/src/vidalia/VAttachButton.h index e1ad3de..bdced09 100644 --- a/src/vidalia/VAttachButton.h +++ b/src/vidalia/VAttachButton.h @@ -17,7 +17,7 @@ class VAttachButton : public QPushButton { signals: void attachTab(); - void dettachTab(); + void detachTab(); public slots: void toggleAttach();

1 0

[vidalia/alpha] Add a nice icon
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit 92ddcc353e5fb98cd88c446537ca940bcc46efef Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 24 15:04:45 2011 -0300 Add a nice icon --- src/vidalia/VAttachButton.cpp | 6 +++++- src/vidalia/res/16x16/detach-arrow.png | Bin 0 -> 602 bytes src/vidalia/res/vidalia.qrc | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/vidalia/VAttachButton.cpp b/src/vidalia/VAttachButton.cpp index fa51b0d..6d9991b 100644 --- a/src/vidalia/VAttachButton.cpp +++ b/src/vidalia/VAttachButton.cpp @@ -1,11 +1,15 @@ #include "VAttachButton.h" +#define IMG_DETACH ":/images/16x16/detach-arrow.png" + VAttachButton::VAttachButton(QWidget *parent) : QPushButton(parent) { _tab = 0; _attached = true; - setText(QString("X")); + setIcon(QIcon(IMG_DETACH)); + setFlat(true); + resize(16,16); } VAttachButton::~VAttachButton() diff --git a/src/vidalia/res/16x16/detach-arrow.png b/src/vidalia/res/16x16/detach-arrow.png new file mode 100644 index 0000000..8beaf74 Binary files /dev/null and b/src/vidalia/res/16x16/detach-arrow.png differ diff --git a/src/vidalia/res/vidalia.qrc b/src/vidalia/res/vidalia.qrc index cfb1004..aa5cfe1 100644 --- a/src/vidalia/res/vidalia.qrc +++ b/src/vidalia/res/vidalia.qrc @@ -27,6 +27,7 @@ <file>16x16/utilities-log-viewer.png</file> <file>16x16/utilities-system-monitor.png</file> <file>16x16/view-media-artist.png</file> + <file>16x16/detach-arrow.png</file> </qresource> <qresource prefix="/images"> <file>22x22/edit_undo.png</file>

1 0

[vidalia/alpha] Add a menu to reattach tabs and fix a wrong disconnect
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit e1bf0c68995ab39d9ea89c5dc6b8031409948388 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 24 14:44:23 2011 -0300 Add a menu to reattach tabs and fix a wrong disconnect This menu should work in every platform, it's the basic idea implementation. From here, drag and drop for the each tab is a better idea from the usability point of view, but it needs to be done with testing in each platform. --- src/vidalia/MainWindow.cpp | 30 ++++++++++++++++++++++++++++++ src/vidalia/MainWindow.h | 3 +++ src/vidalia/VAttachButton.cpp | 2 +- 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 6e16ee4..6ee1883 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -106,6 +106,8 @@ MainWindow::MainWindow() _engine = new PluginEngine(); + _dummy = new QAction(tr("No dettached tabs"), this); + createGUI(); createConnections(); @@ -164,6 +166,8 @@ MainWindow::createActions() void MainWindow::createMenuBar() { + _reattachMenu.setTitle(tr("Reattach tabs")); + QMenuBar *menu = menuBar(); menu->clear(); @@ -192,6 +196,11 @@ MainWindow::createMenuBar() pluginsMenu->addSeparator(); pluginsMenu->addAction(_actionDebugDialog); + menu->addMenu(&_reattachMenu); + _dummy->setText(tr("No detached tabs")); + _reattachMenu.addAction(_dummy); + _dummy->setEnabled(false); + QMenu *helpMenu = menu->addMenu(tr("Help")); helpMenu->addAction(_actionVidaliaHelp); helpMenu->addSeparator(); @@ -225,6 +234,8 @@ MainWindow::createTrayMenu() menu->addAction(_actionNewIdentity); menu->addSeparator(); menu->addAction(_actionShowControlPanel); + + menu->addMenu(&_reattachMenu); #if !defined(Q_WS_MAC) /* These aren't added to the dock menu on Mac, since they are in the @@ -1503,6 +1514,17 @@ void MainWindow::attachTab() { qWarning() << "ATTACHHHHHHHHHH"; + QAction *act = qobject_cast<QAction *>(sender()); + VidaliaTab *tab = qobject_cast<VidaliaTab *>(act->parent()); + qWarning() << tab; + _detachedTabMap.removeAll(tab->getTitle()); + tab->setParent(ui.tabWidget); + addTab(tab); + _reattachMenu.removeAction(act); + if(_reattachMenu.actions().size() < 1) { + _reattachMenu.addAction(_dummy); + _dummy->setEnabled(false); + } } void @@ -1519,6 +1541,11 @@ MainWindow::detachTab() QString key = _tabMap.at(index); _tabMap.removeAll(key); _detachedTabMap << key; + + QAction *act = new QAction(tab->getTitle(), tab); + connect(act, SIGNAL(triggered()), this, SLOT(attachTab())); + _reattachMenu.addAction(act); + _reattachMenu.removeAction(_dummy); } void @@ -1530,6 +1557,9 @@ MainWindow::handleAttachedClose() if(index < 0) { qWarning() << "DETACHEEEEDDDDDDDDDDDDD"; tab->setParent(ui.tabWidget); + + _detachedTabMap.removeAll(tab->getTitle()); + addTab(tab); delTab(ui.tabWidget->currentIndex()); } else { diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index 722a217..b7874fd 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -284,6 +284,9 @@ private: QAction *_actionExit; QAction *_actionDebugDialog; + QMenu _reattachMenu; + QAction *_dummy; + Ui::MainWindow ui; /**< Qt Designer generated object. */ StatusTab _statusTab; /**< Status tab that displays the load progress and a short log */ diff --git a/src/vidalia/VAttachButton.cpp b/src/vidalia/VAttachButton.cpp index 42a4b3e..fa51b0d 100644 --- a/src/vidalia/VAttachButton.cpp +++ b/src/vidalia/VAttachButton.cpp @@ -10,7 +10,7 @@ VAttachButton::VAttachButton(QWidget *parent) : VAttachButton::~VAttachButton() { - disconnect(0,0,0,0); + disconnect(this,0,0,0); } void

1 0

[vidalia/alpha] Fix wrong behavior when closing a detached tab
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit 9703e5eef492e34d80c95bec6912e531158f42b9 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 24 15:15:49 2011 -0300 Fix wrong behavior when closing a detached tab The reattach menu didn't remove the corresponding action when a detached tab was closed without being reattached first. --- src/vidalia/MainWindow.cpp | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 6ee1883..73f610c 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1556,11 +1556,27 @@ MainWindow::handleAttachedClose() qWarning() << index; if(index < 0) { qWarning() << "DETACHEEEEDDDDDDDDDDDDD"; - tab->setParent(ui.tabWidget); + QAction *act = 0; + foreach(QAction *tmpAct, _reattachMenu.actions()) { + if(tmpAct->parent() == tab) { + act = tmpAct; + break; + } + } + + if(act != 0) + _reattachMenu.removeAction(act); _detachedTabMap.removeAll(tab->getTitle()); + tab->setParent(ui.tabWidget); addTab(tab); + + if(_reattachMenu.actions().size() < 1) { + _reattachMenu.addAction(_dummy); + _dummy->setEnabled(false); + } + delTab(ui.tabWidget->currentIndex()); } else { qWarning() << "ATTACHEEEEEDDDD";

1 0

[vidalia/alpha] Improve detach tab on Mac
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit edcd374d95e94be8ab8fb120596ea80b48f27880 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Tue May 31 21:00:59 2011 -0300 Improve detach tab on Mac --- src/vidalia/MainWindow.cpp | 4 ++++ src/vidalia/VAttachButton.cpp | 2 +- src/vidalia/VTabWidget.cpp | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 4c4359e..96d6482 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1603,7 +1603,11 @@ MainWindow::addTab(VidaliaTab *tab) ui.tabWidget->setCurrentIndex(pos); atb->setTab(tab); +#if defined(Q_WS_MAC) + ui.tabWidget->setTabButton(pos, QTabBar::RightSide, atb); +#else ui.tabWidget->setTabButton(pos, QTabBar::LeftSide, atb); +#endif connect(tab, SIGNAL(closeTab()), this, SLOT(handleAttachedClose())); diff --git a/src/vidalia/VAttachButton.cpp b/src/vidalia/VAttachButton.cpp index b5a5bab..e8496f2 100644 --- a/src/vidalia/VAttachButton.cpp +++ b/src/vidalia/VAttachButton.cpp @@ -24,7 +24,7 @@ VAttachButton::VAttachButton(QWidget *parent) : _attached = true; setIcon(QIcon(IMG_DETACH)); setFlat(true); - resize(16,16); + resize(24,24); } VAttachButton::~VAttachButton() diff --git a/src/vidalia/VTabWidget.cpp b/src/vidalia/VTabWidget.cpp index a1bef76..1510549 100644 --- a/src/vidalia/VTabWidget.cpp +++ b/src/vidalia/VTabWidget.cpp @@ -15,6 +15,7 @@ void VTabWidget::pinTab(int position) { tabBar()->setTabButton(position, QTabBar::RightSide, 0); + tabBar()->setTabButton(position, QTabBar::LeftSide, 0); } void

1 0

[vidalia/alpha] Remove unnecessary output
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit 249d587881b4b34080b837ef60a40141ed3a3fdd Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Tue May 24 20:13:37 2011 -0300 Remove unnecessary output --- src/vidalia/MainWindow.cpp | 6 ------ src/vidalia/VidaliaTab.cpp | 1 - 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 73f610c..3e9ce40 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1513,10 +1513,8 @@ MainWindow::handleCloseTab(int index) void MainWindow::attachTab() { - qWarning() << "ATTACHHHHHHHHHH"; QAction *act = qobject_cast<QAction *>(sender()); VidaliaTab *tab = qobject_cast<VidaliaTab *>(act->parent()); - qWarning() << tab; _detachedTabMap.removeAll(tab->getTitle()); tab->setParent(ui.tabWidget); addTab(tab); @@ -1553,9 +1551,7 @@ MainWindow::handleAttachedClose() { VidaliaTab *tab = qobject_cast<VidaliaTab *>(sender()); int index = ui.tabWidget->indexOf(tab); - qWarning() << index; if(index < 0) { - qWarning() << "DETACHEEEEDDDDDDDDDDDDD"; QAction *act = 0; foreach(QAction *tmpAct, _reattachMenu.actions()) { if(tmpAct->parent() == tab) { @@ -1578,8 +1574,6 @@ MainWindow::handleAttachedClose() } delTab(ui.tabWidget->currentIndex()); - } else { - qWarning() << "ATTACHEEEEEDDDD"; } } diff --git a/src/vidalia/VidaliaTab.cpp b/src/vidalia/VidaliaTab.cpp index a35838e..62377e7 100644 --- a/src/vidalia/VidaliaTab.cpp +++ b/src/vidalia/VidaliaTab.cpp @@ -77,7 +77,6 @@ VidaliaTab::closeEvent(QCloseEvent *event) //{ // QDrag *dr = new QDrag(this); // QMimeData *data = new QMimeData(); -// qWarning() << "THIS" << this; // data->setData(tr("vidalia/pointer"), QByteArray().setNum((int)this)); // dr->setMimeData(data); // dr->start();

1 0

[vidalia/alpha] Remove the commented drag and drop code
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit a1d95d1c1734b208ab69452de158eb0234b623db Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu Jun 2 14:18:47 2011 -0300 Remove the commented drag and drop code --- src/vidalia/VidaliaTab.cpp | 9 --------- src/vidalia/VidaliaTab.h | 2 -- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/src/vidalia/VidaliaTab.cpp b/src/vidalia/VidaliaTab.cpp index 62377e7..ee2da03 100644 --- a/src/vidalia/VidaliaTab.cpp +++ b/src/vidalia/VidaliaTab.cpp @@ -72,12 +72,3 @@ VidaliaTab::closeEvent(QCloseEvent *event) emit closeTab(); } -//void -//VidaliaTab::mouseMoveEvent(QMouseEvent *event) -//{ -// QDrag *dr = new QDrag(this); -// QMimeData *data = new QMimeData(); -// data->setData(tr("vidalia/pointer"), QByteArray().setNum((int)this)); -// dr->setMimeData(data); -// dr->start(); -//} diff --git a/src/vidalia/VidaliaTab.h b/src/vidalia/VidaliaTab.h index df26c8a..8a053dc 100644 --- a/src/vidalia/VidaliaTab.h +++ b/src/vidalia/VidaliaTab.h @@ -63,8 +63,6 @@ protected: virtual void closeEvent(QCloseEvent *event); -// virtual void mouseMoveEvent(QMouseEvent *event); - bool _onTop; /**< True if the current tab is the one being displayed */ private:

1 0

[vidalia/alpha] Add comments and clean up a bit
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit 3db72ba0776c8ec42a4601f9b3e6f4e7302a3525 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Fri May 27 20:53:58 2011 -0300 Add comments and clean up a bit --- src/vidalia/MainWindow.cpp | 3 --- src/vidalia/MainWindow.h | 17 +++++++++-------- src/vidalia/VAttachButton.cpp | 15 +++++++++++++++ src/vidalia/VAttachButton.h | 20 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 3e9ce40..4c4359e 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -115,8 +115,6 @@ MainWindow::MainWindow() _status = Unset; _isVidaliaRunningTor = false; updateTorStatus(Stopped); - - setAcceptDrops(true); } /** Destructor */ @@ -197,7 +195,6 @@ MainWindow::createMenuBar() pluginsMenu->addAction(_actionDebugDialog); menu->addMenu(&_reattachMenu); - _dummy->setText(tr("No detached tabs")); _reattachMenu.addAction(_dummy); _dummy->setEnabled(false); diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index b7874fd..d30c059 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -60,10 +60,6 @@ protected: /** Called when the user changes the UI translation. */ virtual void retranslateUi(); -// void dropEvent(QDropEvent *de); -// void dragMoveEvent(QDragMoveEvent *de); -// void dragEnterEvent(QDragEnterEvent *event); - private slots: /** Respond to a double-click on the tray icon by opening the Control Panel * window. */ @@ -151,9 +147,14 @@ private slots: /** Deletes the tab at index if it exists and it isn't the Status tab */ void delTab(int index = -1); + /** Attaches a tab to the tabwidget */ void attachTab(); + /** Detaches a tab from the tabwidget */ void detachTab(); + /** Called when trying to close a tab that has been detached */ + void handleAttachedClose(); + #if defined(USE_AUTOUPDATE) /** Called when the user clicks the 'Check Now' button in the General * settings page. */ @@ -284,19 +285,19 @@ private: QAction *_actionExit; QAction *_actionDebugDialog; - QMenu _reattachMenu; - QAction *_dummy; + QMenu _reattachMenu; /**< Menu used to handle tab re-attaching */ + QAction *_dummy; /**< Dummy action to display when there are no more tabs */ Ui::MainWindow ui; /**< Qt Designer generated object. */ StatusTab _statusTab; /**< Status tab that displays the load progress and a short log */ MessageLog *_messageLog; /**< Message log that displays a more detailed log from Tor */ NetViewer _netViewer; /**< Network map that draws circuits */ - QStringList _tabMap; /**< Map to handle opened tabs */ - QStringList _detachedTabMap; BandwidthGraph *_graph; /**< Graph that draws bandwidth usage */ PluginEngine *_engine; + QStringList _tabMap; /**< Map to handle opened tabs */ + QStringList _detachedTabMap; /**< Map to handle detached tabs */ }; #endif diff --git a/src/vidalia/VAttachButton.cpp b/src/vidalia/VAttachButton.cpp index 6d9991b..b5a5bab 100644 --- a/src/vidalia/VAttachButton.cpp +++ b/src/vidalia/VAttachButton.cpp @@ -1,3 +1,18 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file VAttachButton.cpp +** \brief Button that handles detaching of tabs +*/ + #include "VAttachButton.h" #define IMG_DETACH ":/images/16x16/detach-arrow.png" diff --git a/src/vidalia/VAttachButton.h b/src/vidalia/VAttachButton.h index bdced09..038eef9 100644 --- a/src/vidalia/VAttachButton.h +++ b/src/vidalia/VAttachButton.h @@ -1,3 +1,18 @@ +/* +** This file is part of Vidalia, and is subject to the license terms in the +** LICENSE file, found in the top level directory of this distribution. If you +** did not receive the LICENSE file with this file, you may obtain it from the +** Vidalia source package distributed by the Vidalia Project at +** http://www.torproject.org/projects/vidalia.html. No part of Vidalia, +** including this file, may be copied, modified, propagated, or distributed +** except according to the terms described in the LICENSE file. +*/ + +/* +** \file VAttachButton.cpp +** \brief Button that handles detaching of tabs +*/ + #ifndef VATTACHBUTTON_H #define VATTACHBUTTON_H @@ -12,14 +27,19 @@ class VAttachButton : public QPushButton { VAttachButton(QWidget *parent = 0); ~VAttachButton(); + /** Sets the parent tab for this button */ void setTab(VidaliaTab *tab); + /** Returns the parent tab for this button */ VidaliaTab *getTab(); signals: + /** Emitted when the button is pressed and the tab is detached */ void attachTab(); + /** Emitted when the button is pressed and the tab is attached */ void detachTab(); public slots: + /** Handles the onClicked signal */ void toggleAttach(); private:

1 0

[vidalia/alpha] Improve communication between modules
by chiiph＠torproject.org 02 Jul '11

02 Jul '11

commit 38044c9518ef6335b9499043c3dca965d000e9e6 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Wed Jun 1 23:44:10 2011 -0300 Improve communication between modules Takes out the hacky casts and parent handling for a more Qt-ish way of doing this. --- src/vidalia/MainWindow.cpp | 12 +++--------- src/vidalia/MainWindow.h | 4 ++-- src/vidalia/plugin/PluginEngine.cpp | 23 ++++++++++++++--------- src/vidalia/plugin/PluginEngine.h | 10 ++++++++++ src/vidalia/plugin/PluginWrapper.cpp | 23 ++++++++++++++++++++++- src/vidalia/plugin/PluginWrapper.h | 6 ++++++ 6 files changed, 57 insertions(+), 21 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 931df1c..bd72346 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -183,7 +183,6 @@ MainWindow::createMenuBar() QMenu *pluginsMenu = menu->addMenu(tr("Plugins")); foreach(QAction *action, _engine->getAllActions()) { pluginsMenu->addAction(action); - connect(action, SIGNAL(triggered()), this, SLOT(showPluginTab())); } QMenu *helpMenu = menu->addMenu(tr("Help")); @@ -414,6 +413,9 @@ MainWindow::createConnections() _proxyProcess = new HelperProcess(this); connect(_proxyProcess, SIGNAL(startFailed(QString)), this, SLOT(onProxyFailed(QString))); + + connect(_engine, SIGNAL(pluginTab(VidaliaTab *)), + this, SLOT(addTab(VidaliaTab *))); } /** Called when the application is closing, by selecting "Exit" from the tray @@ -1593,14 +1595,6 @@ MainWindow::delTab(int index) } void -MainWindow::showPluginTab() -{ - QAction *act = qobject_cast<QAction *>(sender()); - PluginWrapper *wrapper = qobject_cast<PluginWrapper *>(act->parent()); - addTab(wrapper->buildGUI()); -} - -void MainWindow::showStatusTab() { addTab(&_statusTab); diff --git a/src/vidalia/MainWindow.h b/src/vidalia/MainWindow.h index e5366b8..8172f71 100644 --- a/src/vidalia/MainWindow.h +++ b/src/vidalia/MainWindow.h @@ -144,8 +144,8 @@ private slots: /** Deletes the tab at index if it exists and it isn't the Status tab */ void delTab(int index = -1); - /** Handles adding a new tab corresponding to a plugin */ - void showPluginTab(); +// /** Handles adding a new tab corresponding to a plugin */ +// void showPluginTab(); /** Called when the web browser or IM client have stopped */ void onSubprocessFinished(int exitCode, QProcess::ExitStatus exitStatus); diff --git a/src/vidalia/plugin/PluginEngine.cpp b/src/vidalia/plugin/PluginEngine.cpp index fe85883..c7b74ea 100644 --- a/src/vidalia/plugin/PluginEngine.cpp +++ b/src/vidalia/plugin/PluginEngine.cpp @@ -5,19 +5,17 @@ PluginEngine::PluginEngine(QObject *parent) : QScriptEngine(parent) { - // load prototypes - VidaliaTabPrototype vtabproto; - QScriptValue vtabscript = newQObject(&vtabproto, QScriptEngine::ScriptOwnership); - setDefaultPrototype(qMetaTypeId<VidaliaTab *>(), vtabscript); - - // load constructors - QScriptValue vtabctor = newFunction(VidaliaTabPrototype::constructor, vtabscript); - globalObject().setProperty("VidaliaTab", vtabctor); + ADD_CLASS("VidaliaTab", VidaliaTabPrototype, VidaliaTab *, + VidaliaTabPrototype::constructor) loadAllPlugins(); } -PluginEngine::~PluginEngine() {} +PluginEngine::~PluginEngine() +{ + foreach(PluginWrapper *wrapper, wrappers) + wrapper->stop(); +} void PluginEngine::loadAllPlugins() @@ -50,7 +48,14 @@ PluginEngine::tryLoadPlugin(QDir path) return; PluginWrapper *wrapper = new PluginWrapper(QString("%1%2info.xml").arg(path.absolutePath()).arg(QDir::separator()), this); + + // if it's persistent, start it right away + if(wrapper->isPersistent()) + wrapper->start(); + wrappers << wrapper; + + connect(wrapper, SIGNAL(pluginTab(VidaliaTab *)), this, SIGNAL(pluginTab(VidaliaTab *))); } QList<QAction *> diff --git a/src/vidalia/plugin/PluginEngine.h b/src/vidalia/plugin/PluginEngine.h index 09bff23..7876803 100644 --- a/src/vidalia/plugin/PluginEngine.h +++ b/src/vidalia/plugin/PluginEngine.h @@ -8,6 +8,13 @@ class PluginWrapper; +#define ADD_CLASS(name, protoType, absType, ctor) \ + protoType __proto; \ + QScriptValue __script = newQObject(&__proto, QScriptEngine::ScriptOwnership); \ + setDefaultPrototype(qMetaTypeId<absType>(), __script); \ + QScriptValue __ctor = newFunction(ctor, __script); \ + globalObject().setProperty(name, __ctor); + class PluginEngine : public QScriptEngine { Q_OBJECT @@ -17,6 +24,9 @@ class PluginEngine : public QScriptEngine { QList<QAction *> getAllActions(); + signals: + void pluginTab(VidaliaTab *); + protected: void loadAllPlugins(); void tryLoadPlugin(QDir path); diff --git a/src/vidalia/plugin/PluginWrapper.cpp b/src/vidalia/plugin/PluginWrapper.cpp index b06b863..8e839fa 100644 --- a/src/vidalia/plugin/PluginWrapper.cpp +++ b/src/vidalia/plugin/PluginWrapper.cpp @@ -100,6 +100,8 @@ PluginWrapper::buildGUI() if(_engine->hasUncaughtException()) { qWarning() << "Exception:"; qWarning() << _engine->uncaughtExceptionLineNumber(); + + return NULL; } qWarning() << "Casted tab:" << tab << nspace(); return tab; @@ -150,8 +152,27 @@ PluginWrapper::files() const QAction * PluginWrapper::menuAction() { + _action = new QAction(_name, this); + if(hasGUI()) { - _action = new QAction(_name, this); + connect(_action, SIGNAL(triggered()), this, SLOT(emitPluginTab())); + } + + // if it hasn't been started yet + if(!isPersistent()) { + connect(_action, SIGNAL(triggered()), this, SLOT(start())); } + return _action; } + +void +PluginWrapper::emitPluginTab() +{ + VidaliaTab *tab = buildGUI(); + if(tab) + emit pluginTab(tab); + else + // TODO: make this more than a console print + qWarning() << "Error: buildGUI() failed for plugin" << name(); +} diff --git a/src/vidalia/plugin/PluginWrapper.h b/src/vidalia/plugin/PluginWrapper.h index 1c7ad8f..d99538c 100644 --- a/src/vidalia/plugin/PluginWrapper.h +++ b/src/vidalia/plugin/PluginWrapper.h @@ -25,11 +25,17 @@ class PluginWrapper : public QObject { QAction *menuAction(); + signals: + void pluginTab(VidaliaTab *); + public slots: void start(); void stop(); VidaliaTab *buildGUI(); + private slots: + void emitPluginTab(); + protected: void processInfo(const QString &path);

1 0