summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <pj@pehjota.net>2017-09-16 16:04:39 (EDT)
committer Patrick McDermott <pj@pehjota.net>2017-09-16 16:04:39 (EDT)
commit9101eb762bc996627119c31a277b7fac53b73b44 (patch)
tree19bfb8e04f172ee72a5301c9ea1167adce14519d
parentdcecfa025ab00ec067d8553cbc9440bf817caeb8 (diff)
downloadmarquee-9101eb762bc996627119c31a277b7fac53b73b44.zip
marquee-9101eb762bc996627119c31a277b7fac53b73b44.tar.gz
marquee-9101eb762bc996627119c31a277b7fac53b73b44.tar.bz2
src/tab.[ch]: New files
And use in src/window.c.
-rw-r--r--src/local.mk3
-rw-r--r--src/tab.c48
-rw-r--r--src/tab.h30
-rw-r--r--src/window.c6
4 files changed, 85 insertions, 2 deletions
diff --git a/src/local.mk b/src/local.mk
index ee5458d..9c9340e 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -1,3 +1,4 @@
marquee_SOURCES += \
%reldir%/main.c \
- %reldir%/window.c
+ %reldir%/window.c \
+ %reldir%/tab.c
diff --git a/src/tab.c b/src/tab.c
new file mode 100644
index 0000000..d274597
--- /dev/null
+++ b/src/tab.c
@@ -0,0 +1,48 @@
+/*
+ * Tab
+ *
+ * Copyright (C) 2017 Patrick McDermott
+ *
+ * This file is part of Marquee.
+ *
+ * Marquee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Marquee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Marquee. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+
+#include <gtk/gtk.h>
+
+#include "tab.h"
+
+MqTab *
+mq_tab_new(gchar *uri)
+{
+ MqTab *tab;
+
+ tab = malloc(sizeof(*tab));
+
+ tab->container = gtk_grid_new();
+ gtk_grid_attach(GTK_GRID(tab->container), gtk_label_new(uri),
+ 0, 0, 1, 1);
+ gtk_grid_attach(GTK_GRID(tab->container), gtk_label_new("Body"),
+ 0, 1, 1, 1);
+
+ return tab;
+}
+
+GtkWidget *
+mq_tab_get_container(MqTab *tab)
+{
+ return tab->container;
+}
diff --git a/src/tab.h b/src/tab.h
new file mode 100644
index 0000000..12afe7e
--- /dev/null
+++ b/src/tab.h
@@ -0,0 +1,30 @@
+/*
+ * Tab
+ *
+ * Copyright (C) 2017 Patrick McDermott
+ *
+ * This file is part of Marquee.
+ *
+ * Marquee is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Marquee is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Marquee. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+typedef struct {
+ GtkWidget *container;
+} MqTab;
+
+MqTab *
+mq_tab_new(gchar *uri);
+
+GtkWidget *
+mq_tab_get_container(MqTab *tab);
diff --git a/src/window.c b/src/window.c
index 7fc36cc..db1dbe1 100644
--- a/src/window.c
+++ b/src/window.c
@@ -24,13 +24,17 @@
#include <gtk/gtk.h>
#include "window.h"
+#include "tab.h"
static void
add_tab(MqWindow *window, gchar *uri, gint position)
{
+ MqTab *tab;
+
+ tab = mq_tab_new(uri);
/* TODO: Set tab label (container widget with icon and title) */
position = gtk_notebook_insert_page(GTK_NOTEBOOK(window->gtk_notebook),
- gtk_label_new(uri), NULL, position);
+ mq_tab_get_container(tab), NULL, position);
}
MqWindow *