Merge branch 'Qt'

After the 3.1 release it is time to shift the focus on the Qt effort - and
the best way to do this is to merge the changes in the Qt branch into
master.

Linus was extremely nice and did a merge for me. I decided to do my own
merge instead (which by accident actually based on a different version of
the Qt branch) and then used his merge to double check what I was doing.

I resolved a few things differently but overall what we did was very much
the same (and I say this with pride since Linus is a professional git
merger)

Here's his merge commit message:

    This is a rough and tumble merge of the Qt branch into 'master',
    trying to sort out the conflicts as best as I could.

    There were two major kinds of conflicts:

     - the Makefile changes, in particular the split of the single
       Makefile into Rules.mk and Configure.mk, along with the obvious Qt
       build changes themselves.

       Those changes conflicted with some of the updates done in mainline
       wrt "release" targets and some helper macros ($(NAME) etc).

       Resolved by largely taking the Qt branch versions, and then editing
       in the most obvious parts of the Makefile updates from mainline.

       NOTE! The script/get_version shell script was made to just fail
       silently on not finding a git repository, which avoided having to
       take some particularly ugly Makefile changes.

     - Various random updates in mainline to support things like dive tags.

       The conflicts were mainly to the gtk GUI parts, which obviously
       looked different afterwards.  I fixed things up to look like the
       newer code, but since the gtk files themselves are actually dead in
       the Qt branch, this is largely irrelevant.

       NOTE! This does *NOT* introduce the equivalent Qt functionality.
       The fields are there in the code now, but there's no Qt UI for the
       whole dive tag stuff etc.

    This seems to compile for me (although I have to force
    "QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to
    work, but it is otherwise largely untested.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 89 insertions, 0 deletions

diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
new file mode 100644
index 000000000..60f0d4609
--- /dev/null
+++ b/qt-ui/mainwindow.h
@@ -0,0 +1,89 @@
+/*
+ * mainwindow.h
+ *
+ * header file for the main window of Subsurface
+ *
+ */
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include <QModelIndex>
+#include <QAction>
+
+class QSortFilterProxyModel;
+class DiveTripModel;
+
+namespace Ui
+{
+	class MainWindow;
+}
+
+class DiveInfo;
+class DiveNotes;
+class Stats;
+class Equipment;
+class QItemSelection;
+
+class MainWindow : public QMainWindow
+{
+Q_OBJECT
+public:
+	MainWindow();
+
+private Q_SLOTS:
+
+	/* file menu action */
+	void on_actionNew_triggered();
+	void on_actionOpen_triggered();
+	void on_actionSave_triggered();
+	void on_actionSaveAs_triggered();
+	void on_actionClose_triggered();
+	void on_actionImport_triggered();
+	void on_actionExportUDDF_triggered();
+	void on_actionPrint_triggered();
+	void on_actionPreferences_triggered();
+	void on_actionQuit_triggered();
+
+	/* log menu actions */
+	void on_actionDownloadDC_triggered();
+	void on_actionDownloadWeb_triggered();
+	void on_actionEditDeviceNames_triggered();
+	void on_actionAddDive_triggered();
+	void on_actionRenumber_triggered();
+	void on_actionAutoGroup_triggered();
+	void on_actionToggleZoom_triggered();
+	void on_actionYearlyStatistics_triggered();
+
+	/* view menu actions */
+	void on_actionViewList_triggered();
+	void on_actionViewProfile_triggered();
+	void on_actionViewInfo_triggered();
+	void on_actionViewAll_triggered();
+	void on_actionPreviousDC_triggered();
+	void on_actionNextDC_triggered();
+
+	/* other menu actions */
+	void on_actionSelectEvents_triggered();
+	void on_actionInputPlan_triggered();
+	void on_actionAboutSubsurface_triggered();
+	void on_actionUserManual_triggered();
+
+	void current_dive_changed(int divenr);
+
+protected:
+	void closeEvent(QCloseEvent *);
+
+private:
+	Ui::MainWindow *ui;
+	QAction *actionNextDive;
+	QAction *actionPreviousDive;
+
+	QString filter();
+	bool askSaveChanges();
+	void readSettings();
+	void writeSettings();
+	void redrawProfile();
+};
+
+#endif