[rkward-cvs] SF.net SVN: rkward: [2074] branches/KDE4_port/rkward

[tfry at users.sourceforge.net]

Revision: 2074
          http://rkward.svn.sourceforge.net/rkward/?rev=2074&view=rev
Author:   tfry
Date:     2007-10-15 15:40:44 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
A window actually comes up, and lives - sort of

Modified Paths:
--------------
    branches/KDE4_port/rkward/dialogs/startupdialog.cpp
    branches/KDE4_port/rkward/dialogs/startupdialog.h
    branches/KDE4_port/rkward/rkward.cpp

Modified: branches/KDE4_port/rkward/dialogs/startupdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/startupdialog.cpp	2007-10-15 21:53:06 UTC (rev 2073)
+++ branches/KDE4_port/rkward/dialogs/startupdialog.cpp	2007-10-15 22:40:44 UTC (rev 2074)
@@ -78,8 +78,6 @@
 	connect (file_list, SIGNAL (doubleClicked (Q3ListViewItem *, const QPoint &, int)), this, SLOT (listDoubleClicked (Q3ListViewItem*, const QPoint &, int)));
 	choser_layout->addWidget (file_list);
 	choser_layout->addWidget (remember_box = new QCheckBox (i18n ("Always do this on startup"), choser));
-
-	setFixedWidth (minimumWidth ());
 }
 
 StartupDialog::~StartupDialog() {
@@ -154,6 +152,14 @@
 	}
 }
 
+void StartupDialog::showEvent (QShowEvent *event) {
+	RK_TRACE (DIALOGS);
+
+	// somehow, trying to achieve this in the ctor leads to the dialog never actually being shown (KDE4.0 beta)
+	setFixedWidth (width ());
+	KDialog::showEvent (event);
+}
+
 //static
 StartupDialog::StartupDialogResult *StartupDialog::getStartupAction (QWidget *parent, KRecentFilesAction *recent_files) {
 	RK_TRACE (DIALOGS);

Modified: branches/KDE4_port/rkward/dialogs/startupdialog.h
===================================================================
--- branches/KDE4_port/rkward/dialogs/startupdialog.h	2007-10-15 21:53:06 UTC (rev 2073)
+++ branches/KDE4_port/rkward/dialogs/startupdialog.h	2007-10-15 22:40:44 UTC (rev 2074)
@@ -64,6 +64,9 @@
 	void listDoubleClicked (Q3ListViewItem *item, const QPoint &, int);
 	void listClicked (Q3ListViewItem *item);
 	void openButtonSelected (bool checked);
+protected:
+/** reimplemented from QWidget to achieve fixed width */
+	void showEvent (QShowEvent *event);
 private:
 	QRadioButton *empty_workspace_button;
 	QRadioButton *empty_table_button;

Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp	2007-10-15 21:53:06 UTC (rev 2073)
+++ branches/KDE4_port/rkward/rkward.cpp	2007-10-15 22:40:44 UTC (rev 2074)
@@ -246,6 +246,7 @@
 	RKWorkplace::mainWorkplace ()->placeInToolWindowBar (help_search, KMultiTabBar::Bottom);
 
 	setUpdatesEnabled (true);
+	show ();
 
 	RKOutputWindow::initialize ();
 	RControlWindow::getControl ()->initialize ();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.