From: Ilkka Tengvall Date: Tue, 5 Oct 2010 19:17:28 +0000 (+0300) Subject: Got the stacked windows working! X-Git-Url: http://vcs.maemo.org/git/?p=woller;a=commitdiff_plain;h=8178c572679068828f20f8ee2a41dfe6855ac2f9 Got the stacked windows working! --- diff --git a/debian/changelog b/debian/changelog index f746998..5f75065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +woller (0.3-0) unstable; urgency=low + + * Got the stacked windows working + + -- Ilkka Tengvall Tue, 5 Oct 2010 22:15:00 +0300 + +woller (0.2-2) unstable; urgency=low + + * Added the bugtracker url to deb as required by maemo autobuilder. + + -- Ilkka Tengvall Tue, 5 Oct 2010 16:31:00 +0300 + woller (0.2-1) unstable; urgency=low * Wrapped the QWidget into QMainWindow to get better handled by window diff --git a/woller.cpp b/woller.cpp index 529835d..f08af4a 100644 --- a/woller.cpp +++ b/woller.cpp @@ -23,10 +23,10 @@ MainWindow::MainWindow() { -//#ifdef Q_WS_MAEMO_5 -// this->setAttribute(Qt::WA_Maemo5StackedWindow); -//#endif - woller = new Woller; +#ifdef Q_WS_MAEMO_5 + this->setAttribute(Qt::WA_Maemo5StackedWindow); +#endif + woller = new Woller(this); this->setCentralWidget(woller); } @@ -132,7 +132,7 @@ void Woller::targets_act(int i) { // build the config widget qDebug() << "building the config" << endl; - config_win = new ConfigWidget(0, hosts_list); + config_win = new ConfigWidget(this, hosts_list); connect(config_win, SIGNAL(hosts_changed()), this, SLOT(hosts_changed())); config_win->show(); } @@ -269,7 +269,7 @@ void ConfigWidget::add_sig() host_tmp.hostname.clear(); host_tmp.mac.clear(); host_tmp.ip.clear(); - host_widget = new HostWidget(0, &host_tmp); + host_widget = new HostWidget(this, &host_tmp); connect(host_widget, SIGNAL(change_host()), this, SLOT(host_added())); host_widget->show(); @@ -283,7 +283,7 @@ void ConfigWidget::edit_sig() host_tmp.hostname = hosts_list->at(list->currentIndex().row()).hostname; host_tmp.mac = hosts_list->at(list->currentIndex().row()).mac; host_tmp.ip = hosts_list->at(list->currentIndex().row()).ip; - host_widget = new HostWidget(0, &host_tmp); + host_widget = new HostWidget(this, &host_tmp); connect(host_widget, SIGNAL(change_host()), this, SLOT(host_edited())); //hostWidget->hostname->setPlaceholderText("my_host_name"); @@ -365,7 +365,7 @@ HostWidget::HostWidget(QWidget *parent, host_s *host) qDebug() << "host widget" << endl; new_host = host; - this->setWindowTitle("Add new WOL target host"); + this->setWindowTitle(tr("WOL target details")); #ifdef Q_WS_MAEMO_5 this->setAttribute(Qt::WA_Maemo5StackedWindow); this->setWindowFlags(this->windowFlags() | Qt::Window);