Delay Qt ui construction

The Qt ui will need to read the dive_table to populate widgets with
dives. Gtk functionality in init_ui is required to parse the dives.
Split init_ui to allow parsing to proceed and complete before Qt ui
mainwindow constructor is called.

Play with qDebug()'s printf style (Thiago!)

Signed-off-by: Amit Chaudhuri <amit.k.chaudhuri@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Amit Chaudhuri 2013-04-18 08:59:31 +01:00 committed by Dirk Hohndel
parent 115ee47bfc
commit 073be111f4
5 changed files with 17 additions and 9 deletions

View file

@ -1864,6 +1864,14 @@ QStringList MainWindow::fileNameFilters() const
}
#endif /* NEEDS_TO_MOVE_TO_QT_UI */
void init_qt_ui(int *argcp, char ***argvp)
{
application = new QApplication(*argcp, *argvp);
application->installTranslator(new Translator(application));
MainWindow *window = new MainWindow();
window->show();
}
void init_ui(int *argcp, char ***argvp)
{
GtkWidget *win;
@ -1877,11 +1885,6 @@ void init_ui(int *argcp, char ***argvp)
GtkSettings *settings;
GtkUIManager *ui_manager;
application = new QApplication(*argcp, *argvp);
application->installTranslator(new Translator(application));
MainWindow *window = new MainWindow();
window->show();
gtk_init(argcp, argvp);
settings = gtk_settings_get_default();
gtk_settings_set_long_property(settings, "gtk-tooltip-timeout", 10, "subsurface setting");