From: Ilkka Tengvall Date: Sun, 3 Oct 2010 18:47:57 +0000 (+0300) Subject: fixed .deb, added MainWindow + Qt Stacked X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=dfb695173c41a1ec53b4c351d0c08b9f1b0d5572;hp=5c2b161963edcab6d2d03284b3d59623106c197c;p=woller fixed .deb, added MainWindow + Qt Stacked * .deb file was now working due some weird reason in application installer gui. Now does work * Tried to get the StackedWindow to work, but failed. --- diff --git a/debian/changelog b/debian/changelog index 8d063c4..f746998 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +woller (0.2-1) unstable; urgency=low + + * Wrapped the QWidget into QMainWindow to get better handled by window + managers. + * Unsuccesfully tried to get Qt Stacked Windows working on maemo. + + -- Ilkka Tengvall Sun, 3 Oct 2010 21:46:00 +0300 + woller (0.1-1) unstable; urgency=low * Initial release diff --git a/debian/control b/debian/control index 14902e3..43c70a4 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: woller -Section: net +Section: user/network Priority: optional Maintainer: Ilkka Tengvall Homepage: http://garage.maemo.org/projects/woller/ @@ -13,47 +13,63 @@ Description: Wake up computers over LAN This program uses WOL (Wake On Lan) feature of the network cards to wake up machines. See http://en.wikipedia.org/wiki/Wake-on-LAN XB-Maemo-Icon-26: - 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 + rkJggg== diff --git a/main.cpp b/main.cpp index 724dcd2..d39bca2 100644 --- a/main.cpp +++ b/main.cpp @@ -5,7 +5,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - Woller woller; + MainWindow woller; woller.show(); return app.exec(); diff --git a/woller.cpp b/woller.cpp index 58d1e85..529835d 100644 --- a/woller.cpp +++ b/woller.cpp @@ -16,8 +16,25 @@ // along with Woller. If not, see . +#ifdef Q_WS_MAEMO_5 + #include +#endif #include "woller.h" +MainWindow::MainWindow() +{ +//#ifdef Q_WS_MAEMO_5 +// this->setAttribute(Qt::WA_Maemo5StackedWindow); +//#endif + woller = new Woller; + this->setCentralWidget(woller); +} + +MainWindow::~MainWindow() +{ + delete woller; +} + Woller::Woller(QWidget *parent) : QWidget(parent) @@ -47,6 +64,11 @@ Woller::Woller(QWidget *parent) vlayout->addLayout(hlayout); this->setLayout(vlayout); this->setWindowTitle(tr("Woller-program")); +#ifdef Q_WS_MAEMO_5 + this->setAttribute(Qt::WA_Maemo5StackedWindow); +#else + this->setWindowModality(Qt::ApplicationModal); +#endif //populate CB load_config(); @@ -111,7 +133,6 @@ void Woller::targets_act(int i) // build the config widget qDebug() << "building the config" << endl; config_win = new ConfigWidget(0, hosts_list); - config_win->setWindowModality(Qt::ApplicationModal); connect(config_win, SIGNAL(hosts_changed()), this, SLOT(hosts_changed())); config_win->show(); } @@ -187,6 +208,12 @@ ConfigWidget::ConfigWidget(QWidget *parent, QList *hosts) //add buttons and the list this->setWindowTitle(tr("Woller Config")); +#ifdef Q_WS_MAEMO_5 + this->setAttribute(Qt::WA_Maemo5StackedWindow); + this->setWindowFlags(this->windowFlags() | Qt::Window); +#else + this->setWindowModality(Qt::ApplicationModal); +#endif add_host = new QPushButton(tr("&Add Host"), this); edit_host = new QPushButton(tr("&Edit Host"), this); del_host = new QPushButton(tr("&Delete Host"), this); @@ -244,7 +271,6 @@ void ConfigWidget::add_sig() host_tmp.ip.clear(); host_widget = new HostWidget(0, &host_tmp); - host_widget->setWindowModality(Qt::ApplicationModal); connect(host_widget, SIGNAL(change_host()), this, SLOT(host_added())); host_widget->show(); qDebug() << "conf add - exit" << endl; @@ -260,7 +286,6 @@ void ConfigWidget::edit_sig() host_widget = new HostWidget(0, &host_tmp); connect(host_widget, SIGNAL(change_host()), this, SLOT(host_edited())); - host_widget->setWindowModality(Qt::ApplicationModal); //hostWidget->hostname->setPlaceholderText("my_host_name"); //hostWidget->hostname->setText("edit1"); //hostWidget->mac->setPlaceholderText("001133aabbcc"); @@ -341,6 +366,12 @@ HostWidget::HostWidget(QWidget *parent, host_s *host) qDebug() << "host widget" << endl; new_host = host; this->setWindowTitle("Add new WOL target host"); +#ifdef Q_WS_MAEMO_5 + this->setAttribute(Qt::WA_Maemo5StackedWindow); + this->setWindowFlags(this->windowFlags() | Qt::Window); +#else + this->setWindowModality(Qt::ApplicationModal); +#endif vlayout = new QVBoxLayout(this); host_row = new QHBoxLayout; diff --git a/woller.h b/woller.h index f1afc71..8963279 100644 --- a/woller.h +++ b/woller.h @@ -183,5 +183,21 @@ private: void do_list(); }; +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + MainWindow(); + ~MainWindow(); + +protected: + +private slots: + +private: + + Woller *woller; +}; #endif diff --git a/woller.pro b/woller.pro index bcf6ebd..72592b3 100644 --- a/woller.pro +++ b/woller.pro @@ -1,6 +1,9 @@ #CONFIG += qt debug CONFIG += qt QT += network +maemo5 { + QT += maemo5 +} HEADERS += woller.h SOURCES += woller.cpp main.cpp @@ -17,11 +20,15 @@ unix { icons40.files = icons/40x40/woller.png icons64.path = $$PREFIX/share/icons/hicolor/64x64/apps icons64.files = icons/64x64/woller.png - menues.path = $$PREFIX/share/applications/hildon + menues.path = $$PREFIX/share/applications menues.files = woller.desktop docs.path = $$PREFIX/share/doc/woller docs.files = README.txt target.path = $$PREFIX/bin } +maemo5 { + menues.path = $$PREFIX/share/applications/hildon +} + INSTALLS += target icons icons26 icons40 icons64 menues docs