Skip to content

Commit 3c41fac

Browse files
staalmannenstaalmannen
committed
initial merge of gqt into gtk-made-qt without source changes
1 parent a6c6b9a commit 3c41fac

23 files changed

+1070
-0
lines changed

‎README.gqt

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Hi there.
2+
3+
If you've found this code, chances are, it's not what you want. It's very incomplete, probably very ugly, and it may also be against your religious beliefs.
4+
5+
If you're still with me, here's what it is. At the core of things, it's a wrapper providing the GTK (and GLib interfaces) wrapping around Qt.
6+
7+
The ultimate aim is to allow GTK/GLib applications to compile with Qt to provide a more unified system (with less dependancies, i.e. GTK), and to ease porting of applications to Qt.
8+
9+
Architecturally, it's one big ugly .h (this will probably change, as more stuff is wrapped) 'gtk/gtk.h', which provides the GTK API, and includes the Qt equivilants (i.e. QtGui and so on) to do the heavy lifting.
10+
11+
To use this with an application using GTK, you'll need to first verify it builds as valid C++ (sorry, it's required.)
12+
13+
To do this, substitute g++ for gcc, and make sure it doesn't blow up.
14+
15+
If it does, fix your code.
16+
17+
If it doesn't, try something like this:
18+
g++ my.c -o myapp -I/home/my/path/to/gqt -I/home/my/path/to/qt4/include -I/home/my/path/to/qt4/include/QtGui -I/home/my/path/to/qt4/include/QtCore -L/home/my/path/to/qt4/lib -lQtCore -lQtGui -Wl, --rpath -Wl, /home/my/path/to/qt4/lib
19+
20+
.. and obviously, run myapp.
21+
22+
If it doesn't work, fix it, and tell me about the fix.
23+
24+
I am reachable at:
25+
Robin Burchell <[email protected]>
26+
27+
Thanks to:
28+
John Brooks <[email protected]>

‎include/gtk/glib_signals.h

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
// glib overrides for signal bits
2+
typedef void (*GCallback)(GtkWidget *target, gpointer);
3+
#define G_CALLBACK(x) (GCallback)x
4+
#define g_list_append(x, y) g_list_append(x, (void *)y)
5+
6+
class GQTSignalHandler
7+
{
8+
private:
9+
GCallback callback;
10+
gpointer user_data;
11+
12+
public:
13+
GQTSignalHandler(GCallback where_to, gpointer data) : callback(where_to), user_data(data)
14+
{
15+
}
16+
17+
void invoke(GtkWidget *w)
18+
{
19+
this->callback(w, user_data);
20+
}
21+
};
22+
23+
/*
24+
* Let the magic begin!
25+
*
26+
* This map will store all hooked signals.
27+
* The first 'void *' key is the instance that is hooked (i.e. 'this').
28+
* It stores a map of signals which are hooked, i.e. 'clicked' -> pointer.
29+
*/
30+
static QMap<void *, QMap<QString, GQTSignalHandler *> > gqt_signals;
31+
32+
gulong g_signal_connect(gpointer instance, const gchar *detailed_signal, GCallback c_handler, gpointer data)
33+
{
34+
Q_ASSERT(instance && detailed_signal && c_handler);
35+
qDebug("g_signal_connect(): Hooked %s signal on %p going to %p", detailed_signal, instance, c_handler);
36+
gqt_signals[instance][detailed_signal] = new GQTSignalHandler(c_handler, data);
37+
}
38+
39+
void gqt_signal_execute(void *widget, const gchar *signal)
40+
{
41+
Q_ASSERT(widget && signal);
42+
43+
GtkWidget *w = (GtkWidget *)widget;
44+
45+
QMap<void *, QMap<QString, GQTSignalHandler *> >::ConstIterator it = gqt_signals.constFind(widget);
46+
47+
if (it == gqt_signals.end())
48+
{
49+
qDebug("No signals hooked on target widget %p", widget);
50+
return;
51+
}
52+
53+
QMap<QString, GQTSignalHandler *> m = *it;
54+
QMap<QString, GQTSignalHandler *>::ConstIterator it2 = m.constFind(signal);
55+
56+
if (it == gqt_signals.end())
57+
{
58+
qDebug("Signal %s not hooked on target widget %p", signal, widget);
59+
return;
60+
}
61+
62+
qDebug("Invoking %s on %p", signal, widget);
63+
GQTSignalHandler *s = *it2;
64+
s->invoke(w);
65+
}

‎include/gtk/gqt_dialog.h

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
class GQTDialog : public QWidget
3+
{
4+
protected:
5+
void closeEvent(QCloseEvent *event)
6+
{
7+
// Fire response signal.
8+
gqt_signal_execute(this, "response");
9+
}
10+
};

‎include/gtk/gtk.h

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
#ifndef __GTK__
2+
#define __GTK__
3+
4+
// We override parts of glib (like signals), so make sure that glib is *always* included first.
5+
#ifndef g_signal_connect
6+
#warning "You must include glib.h before gtk.h. I'm doing it for you for now."
7+
#pragma message("You must include glib.h before gtk.h. I'm doing it for you for now.")
8+
#include <glib.h>
9+
#endif
10+
11+
#include <QApplication>
12+
#include <QWidget>
13+
#include <QLabel>
14+
#include <QPushButton>
15+
#include <QHBoxLayout>
16+
#include <QVBoxLayout>
17+
#include <QGridLayout>
18+
#include <QLineEdit>
19+
#include <QComboBox>
20+
#include <QCheckBox>
21+
#include <QTextEdit>
22+
#include <QMap>
23+
#include <QMenuBar>
24+
#include <QGroupBox>
25+
#include <QAction>
26+
#include <QActionGroup>
27+
28+
//#include <glib/glib.h>
29+
30+
typedef QWidget GtkWidget;
31+
typedef QWidget GtkWindow;
32+
33+
typedef QWidget GtkBox; /* ugh */
34+
typedef QWidget GtkContainer; /* ugh */
35+
typedef QHBoxLayout GtkHBox;
36+
typedef QVBoxLayout GtkVBox;
37+
typedef QWidget GtkTable;
38+
39+
typedef QTextEdit GtkTextView;
40+
typedef QTextEdit GtkTextBuffer;
41+
typedef QMenuBar GtkMenuBar;
42+
typedef QMenu GtkMenuShell;
43+
typedef QMenu GtkMenuItem;
44+
45+
typedef QLabel GtkLabel;
46+
47+
// XXX: will need porting for win32 (and non-gcc compilers..)
48+
#define MARK_DEPRECATED __attribute((deprecated))
49+
50+
51+
// Stupid GTK typecasting crap.
52+
#define GTK_BOX(x) x
53+
#define GTK_CONTAINER(x) x
54+
#define GTK_TABLE(x) x
55+
#define GTK_WINDOW(x) x
56+
#define GTK_TEXT_VIEW(x) dynamic_cast<QTextEdit *>(x)
57+
#define GTK_OBJECT(x) (void *)x /* obsolete */
58+
#define G_OBJECT(x) (void *)x
59+
#define GTK_MENU_BAR(x) dynamic_cast<QMenuBar *>(x)
60+
#define GTK_MENU_ITEM(x) dynamic_cast<QMenu *>(x)
61+
#define GTK_MENU(x) dynamic_cast<QMenu *>(x)
62+
#define GTK_LABEL(x) dynamic_cast<QLabel *>(x)
63+
#define GTK_ABOUT_DIALOG(x) dynamic_cast<GQTAboutDialog *>(x)
64+
65+
// Stock stuff
66+
#define GTK_STOCK_QUIT "gtk-quit"
67+
#define GTK_STOCK_ABOUT "gtk-about"
68+
69+
enum GtkAttachOptions
70+
{
71+
GTK_EXPAND,
72+
GTK_SHRINK,
73+
GTK_FILL
74+
};
75+
76+
// Now, override the parts of glib that we need to.
77+
#include <gtk/glib_signals.h>
78+
79+
80+
#include <gtk/gqt_dialog.h>
81+
#include <gtk/gtk_box.h>
82+
#include <gtk/gtk_main.h>
83+
#include <gtk/gtk_button.h>
84+
#include <gtk/gtk_window.h>
85+
#include <gtk/gtk_hbox.h>
86+
#include <gtk/gtk_vbox.h>
87+
#include <gtk/gtk_container.h>
88+
#include <gtk/gtk_label.h>
89+
#include <gtk/gtk_entry.h>
90+
#include <gtk/gtk_table.h>
91+
#include <gtk/gtk_combo.h>
92+
#include <gtk/gtk_check_button.h>
93+
#include <gtk/gtk_text_view.h>
94+
#include <gtk/gtk_menu.h>
95+
#include <gtk/gtk_about_dialog.h>
96+
#include <gtk/gtk_widget.h>
97+
#include <gtk/gtk_frame.h>
98+
#include <gtk/gtk_action_group.h>
99+
#include <gtk/gtk_ui_manager.h>
100+
101+
102+
#endif

‎include/gtk/gtk_about_dialog.h

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
class GQTAboutDialog;
2+
typedef GQTAboutDialog GtkAboutDialog;
3+
4+
5+
class GQTAboutDialog : public GQTDialog
6+
{
7+
private:
8+
QLabel *program_name;
9+
QLabel *version;
10+
QLabel *comments;
11+
QTextEdit *licence;
12+
13+
QVBoxLayout *layout;
14+
public:
15+
GQTAboutDialog() : GQTDialog()
16+
{
17+
QHBoxLayout *h;
18+
19+
this->setWindowTitle("About");
20+
this->layout = new QVBoxLayout(this);
21+
22+
// FIXME: there is some error about 'Attempting to add QLayout "" to QWidget "", which already has a layout.
23+
// Not sure what this is, doesn't seem to break anything, needs solving anyway.
24+
h = new QHBoxLayout(this);
25+
// FIXME: to match GTK, these two widgets need their text bolded.
26+
h->addWidget((this->program_name = new QLabel(this)), 0, Qt::AlignCenter);
27+
h->addWidget((this->version = new QLabel(this)), 0, Qt::AlignCenter);
28+
29+
this->layout->addLayout(h);
30+
this->layout->addWidget((this->comments = new QLabel(this)), 0, Qt::AlignCenter);
31+
32+
/*
33+
* FIXME: to mimic GTK, we should create a second QHBox, add a 'licence' and 'close' button
34+
* and display licence in a QTextView in a new window if clicked.
35+
*
36+
* I won't do that now because I don't want to MOC a second file atm.
37+
*/
38+
this->layout->addWidget((this->licence = new QTextEdit(this)));
39+
40+
this->setLayout(this->layout);
41+
}
42+
43+
~GQTAboutDialog()
44+
{
45+
}
46+
47+
void setProgramName(QString name)
48+
{
49+
this->program_name->setText(name);
50+
}
51+
52+
void setLicence(QString licence)
53+
{
54+
this->licence->setText(licence);
55+
}
56+
57+
void setVersion(QString version)
58+
{
59+
this->version->setText(version);
60+
}
61+
62+
void setComments(QString comments)
63+
{
64+
this->comments->setText(comments);
65+
}
66+
};
67+
68+
GtkWidget *gtk_about_dialog_new()
69+
{
70+
return new GQTAboutDialog();
71+
}
72+
73+
void gtk_about_dialog_set_program_name(GtkAboutDialog *diag, const gchar *s)
74+
{
75+
Q_ASSERT(diag && s);
76+
77+
diag->setProgramName(s);
78+
}
79+
80+
void gtk_about_dialog_set_license(GtkAboutDialog *diag, const gchar *s)
81+
{
82+
Q_ASSERT(diag && s);
83+
84+
diag->setLicence(s);
85+
}
86+
87+
void gtk_about_dialog_set_version(GtkAboutDialog *diag, const gchar *s)
88+
{
89+
Q_ASSERT(diag && s);
90+
91+
diag->setVersion(s);
92+
}
93+
94+
void gtk_about_dialog_set_comments(GtkAboutDialog *diag, const gchar *s)
95+
{
96+
Q_ASSERT(diag && s);
97+
98+
diag->setComments(s);
99+
}

‎include/gtk/gtk_action_group.h

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
typedef QActionGroup GtkActionGroup;
2+
//typedef QAction GtkActionEntry;
3+
4+
// This really needs to be a struct thanks to the way userland code (and things like gtk_action_group_add_actions() works).
5+
typedef struct
6+
{
7+
const gchar *name;
8+
const gchar *stock_id;
9+
const gchar *label;
10+
const gchar *accelerator;
11+
const gchar *tooltip;
12+
GCallback callback;
13+
} GtkActionEntry;
14+
15+
16+
GtkActionGroup *gtk_action_group_new(const gchar *name)
17+
{
18+
// XXX 2: we ignore name, this requires implementing, perhaps via QObject::setProperty()?
19+
return NULL;
20+
}
21+
22+
void gtk_action_group_add_actions(GtkActionGroup *ag, GtkActionEntry *actions, gint action_count, gpointer user_data)
23+
{
24+
25+
}

‎include/gtk/gtk_box.h

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
// TODO: respect expand, fill, padding
3+
void gtk_box_pack_start(GtkBox *box, GtkWidget *child, gboolean expand, gboolean fill, guint padding)
4+
{
5+
Q_ASSERT(box && child);
6+
7+
if (!box->layout())
8+
{
9+
// XXX: is this behaviour correct? we need it for gtk_container_add() and the like on a main window (ugh)
10+
GtkHBox *h = new GtkHBox(NULL);
11+
h->setParent(box);
12+
box->setLayout(h);
13+
}
14+
15+
// GtkBox is actually a QWidget with a layout set to work around GTK's
16+
// odd idea of layouts being widgets. Retrieve the set layout, and pack
17+
box->layout()->addWidget(child);
18+
child->setParent(box);
19+
}
20+

‎include/gtk/gtk_button.h

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
class GQTPushButton;
2+
typedef GQTPushButton GtkButton;
3+
4+
class GQTPushButton : public QPushButton
5+
{
6+
Q_OBJECT
7+
8+
public:
9+
GQTPushButton(const char *text, QWidget *parent) : QPushButton(text, parent)
10+
{
11+
this->connect(this, SIGNAL(clicked()), SLOT(gqt_clicked()));
12+
13+
}
14+
public slots:
15+
void gqt_clicked()
16+
{
17+
gqt_signal_execute(this, "clicked");
18+
}
19+
};
20+
21+
#include <gtk/moc_gtk_button.h>
22+
23+
GtkWidget *gtk_button_new()
24+
{
25+
return new GtkButton(NULL, NULL);
26+
}
27+
28+
GtkWidget *gtk_button_new_with_label(const gchar *text)
29+
{
30+
Q_ASSERT(text);
31+
32+
return new GtkButton(text, NULL);
33+
}
34+
35+
GtkWidget *gtk_toggle_button_new_with_label(const gchar *text)
36+
{
37+
Q_ASSERT(text);
38+
39+
GtkButton *b = new GtkButton(text, NULL);
40+
b->setCheckable(true);
41+
return b;
42+
}
43+

0 commit comments

Comments
 (0)