Start creating the Qt UI

This is based on several commits from Tomaz - mingled together and mildly
extended by Dirk (mostly Makefile hacking).

All Qt UI related stuff should eventually move into the qt-ui directory.
So the Makefile rules for moc and uic have been adjusted accordingly.

The MainWindow class has been moved into its own file in qt-ui (but just
with a placeholder, the existing class has simply been ifdef'ed out in
qt-gui.cpp for the moment).

We still have a couple of Qt things in qt-gui.cpp in the main directory...
all this needs to move into the qt-ui directory and be built with separate
.h files. Right now we have the one-off Makefile rule to create the
qt-gui.moc file from the qt-gui.cpp file.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2013-04-07 15:20:43 -07:00 committed by Dirk Hohndel
parent 081000963a
commit ba712c3b54
10 changed files with 1204 additions and 15 deletions

View file

@ -24,10 +24,11 @@
#include "webservice.h"
#include "version.h"
#include "libdivecomputer.h"
#include "main-window.ui.h"
#include "qt-ui/mainwindow.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixdata.h>
#include <QApplication>
#include <QFileDialog>
#include <QFileInfo>
@ -1737,6 +1738,9 @@ static gboolean notebook_tooltip (GtkWidget *widget, gint x, gint y,
}
}
#if NEEDS_TO_MOVE_TO_QT_UI
/* this appears to have moved - but it's very different in qt-ui */
class MainWindow: public QMainWindow, private Ui::MainWindow
{
Q_OBJECT
@ -1850,6 +1854,7 @@ QStringList MainWindow::fileNameFilters() const
;
return filters;
}
#endif /* NEEDS_TO_MOVE_TO_QT_UI */
void init_ui(int *argcp, char ***argvp)
{