Pantyhose-X
/
LibreWeb-Browser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to menubuttons

master
Melroy van den Berg 2021-08-28 23:08:22 +02:00
parent 20a66dd5f9
commit 0b71fb787d
No known key found for this signature in database
GPG Key ID: 71D11FF23454B9D7
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mainwindow.cc
View File

@ -272,8 +272,8 @@ void MainWindow::initSettingsPopover()
m_gridSetings.attach(m_indentLabel, 0, 3);
m_gridSetings.attach(m_indentSpinButton, 1, 3);
m_iconThemeButton.set_property("submenu", "aa");
m_iconThemeButton.set_label("Icon Theme");
m_iconThemeButton.property_menu_name() = "icon-theme";
m_aboutButton.set_label("About LibreWeb");
Gtk::Label *iconThemeButtonlabel = dynamic_cast<Gtk::Label*>(m_iconThemeButton.get_child());
iconThemeButtonlabel->set_xalign(0.0);
@ -346,8 +346,6 @@ void MainWindow::initSignals()
m_refreshButton.signal_clicked().connect(sigc::mem_fun(this, &MainWindow::refresh)); /*!< Button for reloading the page */
m_homeButton.signal_clicked().connect(sigc::mem_fun(this, &MainWindow::go_home)); /*!< Button for home page */
m_searchButton.signal_clicked().connect(sigc::bind(sigc::mem_fun(this, &MainWindow::show_search), false)); /*!< Button for finding text */
m_statusButton.signal_clicked().connect(sigc::mem_fun(this, &MainWindow::show_status)); /*!< Button for IPFS status */
m_settingsButton.signal_clicked().connect(sigc::mem_fun(this, &MainWindow::show_settings)); /*!< Button for settings */
m_searchEntry.signal_activate().connect(sigc::mem_fun(this, &MainWindow::on_search)); /*!< Execute the text search */
m_searchReplaceEntry.signal_activate().connect(sigc::mem_fun(this, &MainWindow::on_replace)); /*!< Execute the text replace */
@ -531,6 +529,8 @@ void MainWindow::initButtons()
styleForward->add_class("circular");
auto styleRefresh = m_refreshButton.get_style_context();
styleRefresh->add_class("circular");
m_statusButton.set_popover(m_statusPopover);
m_settingsButton.set_popover(m_settingsPopover);
m_backButton.set_relief(Gtk::RELIEF_NONE);
m_forwardButton.set_relief(Gtk::RELIEF_NONE);
m_refreshButton.set_relief(Gtk::RELIEF_NONE);
@ -1305,22 +1305,6 @@ void MainWindow::go_home()
doRequest("about:home", true, false, true);
}
/**
* \brief Show IFFS status popup
*/
void MainWindow::show_status()
{
this->m_statusPopover.popup();
}
/**
* \brief Show settings popup
*/
void MainWindow::show_settings()
{
this->m_settingsPopover.popup();
}
/**
* \brief Copy the IPFS Client ID to clipboard
*/

11
src/mainwindow.h
View File

@ -13,12 +13,14 @@
#include <gtkmm/menubar.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/button.h>
#include <gtkmm/menubutton.h>
#include <gtkmm/togglebutton.h>
#include <gtkmm/spinbutton.h>
#include <gtkmm/modelbutton.h>
#include <gtkmm/fontbutton.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/popover.h>
#include <gtkmm/popovermenu.h>
#include <gtkmm/grid.h>
#include <gtkmm/scale.h>
#include <gtkmm/filechooserdialog.h>
@ -64,8 +66,6 @@ protected:
void on_save_as_dialog_response(int response_id, Gtk::FileChooserDialog* dialog);
void publish();
void go_home();
void show_status();
void show_settings();
void copy_client_id();
void copy_client_public_key();
void address_bar_activate();
@ -119,6 +119,7 @@ protected:
Gtk::Box m_vboxSettings;
Gtk::Box m_hboxSetingsZoom;
Gtk::Box m_hboxSetingsBrightness;
Gtk::Box m_vboxTemp;
Gtk::Scale m_scaleSettingsBrightness;
Gtk::Entry m_addressBar;
Gtk::ToggleButton m_searchMatchCase;
@ -137,8 +138,8 @@ protected:
Gtk::Button m_refreshButton;
Gtk::Button m_homeButton;
Gtk::Button m_searchButton;
Gtk::Button m_statusButton;
Gtk::Button m_settingsButton;
Gtk::MenuButton m_statusButton;
Gtk::MenuButton m_settingsButton;
Gtk::Button m_openButton;
Gtk::Button m_saveButton;
Gtk::Button m_publishButton;
@ -196,7 +197,7 @@ protected:
Gtk::Image m_hightlightIcon;
Gtk::Image m_exitBottomIcon;
Gtk::Popover m_statusPopover;
Gtk::Popover m_settingsPopover;
Gtk::Popover m_settingsPopover; // Move to PopoverMenu, so I'm able to add submenu's !?
Gtk::Button m_copyIDButton;
Gtk::Button m_copyPublicKeyButton;
Gtk::Label m_fontLabel;