summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <pj@pehjota.net>2017-10-13 03:59:13 (EDT)
committer Patrick McDermott <pj@pehjota.net>2017-10-13 04:01:10 (EDT)
commit9f90be1048327b22c21e8d701bed48826f2c0e57 (patch)
tree29355fefcc151f7029128f123e4723ca22008f1b
parent2750ebbb25d96442513152d7f01811aa593564d8 (diff)
downloadmarquee-9f90be1048327b22c21e8d701bed48826f2c0e57.zip
marquee-9f90be1048327b22c21e8d701bed48826f2c0e57.tar.gz
marquee-9f90be1048327b22c21e8d701bed48826f2c0e57.tar.bz2
MqTabChrome: Remove class
Replaced by MqNavigationToolbar.
-rw-r--r--src/local.mk1
-rw-r--r--src/tab-chrome.c100
-rw-r--r--src/tab-chrome.h49
3 files changed, 0 insertions, 150 deletions
diff --git a/src/local.mk b/src/local.mk
index fcfeba7..fb75b51 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -5,7 +5,6 @@ marquee_SOURCES += \
%reldir%/web-settings.c \
%reldir%/window.c \
%reldir%/tab.c \
- %reldir%/tab-chrome.c \
%reldir%/navigation-toolbar.c \
%reldir%/back-forward-button-box.c \
%reldir%/stop-reload-button.c \
diff --git a/src/tab-chrome.c b/src/tab-chrome.c
deleted file mode 100644
index 55df39a..0000000
--- a/src/tab-chrome.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Tab chrome
- *
- * 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 <string.h>
-
-#include <gtk/gtk.h>
-#include <webkit2/webkit2.h>
-
-#include "tab-chrome.h"
-#include "tab.h"
-#include "back-forward-button-box.h"
-#include "stop-reload-button.h"
-#include "uri-entry.h"
-#include "home-button.h"
-#include "main-menu.h"
-#include "find-toolbar.h"
-
-static GtkWidget *
-navigation_toolbar_new(MqTabChrome *chrome, const gchar *uri)
-{
- GtkToolItem *back_forward_button_box;
- GtkToolItem *stop_reload_button;
- GtkToolItem *uri_entry;
- GtkToolItem *home_button;
- GtkToolItem *menu_button;
- GtkToolbar *navigation_toolbar;
-
- /* Back/forward button box */
- back_forward_button_box = mq_back_forward_button_box_new(
- chrome->web_view);
-
- /* Stop/reload button */
- stop_reload_button = mq_stop_reload_button_new(chrome->web_view);
-
- /* URI entry */
- uri_entry = mq_uri_entry_new(chrome->web_view, uri);
-
- /* Home button */
- home_button = mq_home_button_new(chrome->config, chrome->web_view);
-
- /* Menu button */
- menu_button = mq_main_menu_new(chrome->tab,
- chrome->find_toolbar, chrome->web_view);
-
- /* Navigation toolbar */
- navigation_toolbar = GTK_TOOLBAR(gtk_toolbar_new());
- gtk_toolbar_insert(navigation_toolbar, back_forward_button_box, -1);
- gtk_toolbar_insert(navigation_toolbar, stop_reload_button, -1);
- gtk_toolbar_insert(navigation_toolbar, uri_entry, -1);
- gtk_toolbar_insert(navigation_toolbar, home_button, -1);
- gtk_toolbar_insert(navigation_toolbar, menu_button, -1);
-
- gtk_widget_set_hexpand(GTK_WIDGET(navigation_toolbar), TRUE);
-
- return GTK_WIDGET(navigation_toolbar);
-}
-
-MqTabChrome *
-mq_tab_chrome_new(MqTab *tab, MqFindToolbar *find_toolbar, MqWebView *web_view,
- const gchar *uri)
-{
- MqTabChrome *chrome;
-
- chrome = malloc(sizeof(*chrome));
- chrome->config = mq_application_get_config(mq_tab_get_application(tab));
- chrome->tab = tab;
- chrome->find_toolbar = find_toolbar;
- chrome->web_view = web_view;
-
- chrome->container = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start(GTK_BOX(chrome->container),
- navigation_toolbar_new(chrome, uri), FALSE, FALSE, 0);
-
- return chrome;
-}
-
-GtkWidget *
-mq_tab_chrome_get_container(MqTabChrome *chrome)
-{
- return chrome->container;
-}
diff --git a/src/tab-chrome.h b/src/tab-chrome.h
deleted file mode 100644
index fdff7bd..0000000
--- a/src/tab-chrome.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Tab chrome
- *
- * 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 MqTabChrome MqTabChrome;
-
-#ifndef MQ_TAB_CHROME_H
-#define MQ_TAB_CHROME_H
-
-#include <gtk/gtk.h>
-#include <webkit2/webkit2.h>
-
-#include "tab.h"
-#include "find-toolbar.h"
-#include "web-view.h"
-
-struct MqTabChrome {
- MqConfig *config;
- MqTab *tab;
- GtkWidget *container;
- MqFindToolbar *find_toolbar;
- MqWebView *web_view;
-};
-
-MqTabChrome *
-mq_tab_chrome_new(MqTab *tab, MqFindToolbar *find_toolbar, MqWebView *web_view,
- const gchar *uri);
-
-GtkWidget *
-mq_tab_chrome_get_container(MqTabChrome *chrome);
-
-#endif