mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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:
parent
115ee47bfc
commit
073be111f4
5 changed files with 17 additions and 9 deletions
13
qt-gui.cpp
13
qt-gui.cpp
|
@ -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");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue