Remove the majority of the Gtk related code

- rip all Gtk code from qt-gui.cpp
- don't compile Gtk specific files
- don't link against Gtk libraries
- don't compile modules we don't use at all (yet)
- use #if USE_GTK_UI on the remaining files to disable Gtk related parts
- disable the non-functional Cochran support while I'm at it

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-03 11:04:51 -07:00
parent a6b89b3254
commit 8677721e85
21 changed files with 2684 additions and 2445 deletions

View file

@ -16,10 +16,14 @@
#include "dive.h"
#include "display.h"
#if USE_GTK_UI
#include "display-gtk.h"
#endif
#include "divelist.h"
#include "conversions.h"
#if USE_GTK_UI
#include "display-gtk.h"
static GtkListStore *cylinder_model, *weightsystem_model;
enum {
@ -69,6 +73,7 @@ struct ws_widget {
GtkSpinButton *weight;
int w_idx;
};
#endif /* USE_GTK_UI */
/* we want bar - so let's not use our unit functions */
int convert_pressure(int mbar, double *p)
@ -120,6 +125,7 @@ static int convert_weight(int grams, double *m)
return decimals;
}
#if USE_GTK_UI
static void set_cylinder_description(struct cylinder_widget *cylinder, const char *desc)
{
set_active_text(cylinder->description, desc);
@ -451,6 +457,28 @@ static void show_weightsystem(weightsystem_t *ws, struct ws_widget *weightsystem
set_weight_description(weightsystem_widget, desc);
set_weight_weight_spinbutton(weightsystem_widget, ws->weight.grams);
}
#else
/* placeholders for a few functions that we need to redesign for the Qt UI */
void add_cylinder_description(cylinder_type_t *type)
{
const char *desc;
desc = type->description;
if (!desc)
return;
/* now do something with it... */
}
void add_weightsystem_description(weightsystem_t *weightsystem)
{
const char *desc;
desc = weightsystem->description;
if (!desc)
return;
/* now do something with it... */
}
#endif /* USE_GTK_UI */
gboolean cylinder_nodata(cylinder_t *cyl)
{
@ -515,6 +543,7 @@ gboolean weightsystems_equal(weightsystem_t *ws1, weightsystem_t *ws2)
return TRUE;
}
#if USE_GTK_UI
static void set_one_cylinder(void *_data, GtkListStore *model, GtkTreeIter *iter)
{
cylinder_t *cyl = _data;
@ -784,7 +813,7 @@ static void record_weightsystem_changes(weightsystem_t *ws, struct ws_widget *we
ws->description = desc;
add_weightsystem_type(desc, grams, &iter);
}
#endif /* USE_GTK_UI */
/*
* We hardcode the most common standard cylinders,
* we should pick up any other names from the dive
@ -833,6 +862,7 @@ struct tank_info tank_info[100] = {
{ NULL, }
};
#if USE_GTK_UI
static void fill_tank_list(GtkListStore *store)
{
GtkTreeIter iter;
@ -1679,3 +1709,4 @@ void clear_equipment_widgets()
gtk_list_store_clear(cylinder_list[W_IDX_PRIMARY].model);
gtk_list_store_clear(weightsystem_list[W_IDX_PRIMARY].model);
}
#endif /* USE_GTK_UI */