zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Replaced deprecated VBox/HBox with Box, and HPaned/VPaned with Paned

merge-requests/365/head
eidheim 9 years ago
parent
13cb8f688f
commit
f6e82df359
7 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/notebook.cc
  2. 4
      src/notebook.h
  3. 2
      src/project.cc
  4. 4
      src/project.h
  5. 2
      src/selectiondialog.cc
  6. 2
      src/selectiondialog.h
  7. 20
      src/window.cc

12
src/notebook.cc
Unescape View File

@ -29,7 +29,7 @@ Notebook::TabLabel::TabLabel(const boost::filesystem::path &path, std::function<
set_tooltip_text(path.string()); set_tooltip_text(path.string());
auto button=Gtk::manage(new Gtk::Button()); auto button=Gtk::manage(new Gtk::Button());
auto hbox=Gtk::manage(new Gtk::HBox()); auto hbox=Gtk::manage(new Gtk::Box());
hbox->set_can_focus(false); hbox->set_can_focus(false);
label.set_text(path.filename().string()+' '); label.set_text(path.filename().string()+' ');
@ -54,14 +54,14 @@ Notebook::TabLabel::TabLabel(const boost::filesystem::path &path, std::function<
show_all(); show_all();
} }
Notebook::Notebook() : Gtk::HPaned(), notebooks(2) { Notebook::Notebook() : Gtk::Paned(), notebooks(2) {
Gsv::init(); Gsv::init();
for(auto &notebook: notebooks) { for(auto &notebook: notebooks) {
notebook.set_scrollable(); notebook.set_scrollable();
notebook.set_group_name("source_notebooks"); notebook.set_group_name("source_notebooks");
notebook.signal_switch_page().connect([this](Gtk::Widget *widget, guint) { notebook.signal_switch_page().connect([this](Gtk::Widget *widget, guint) {
auto hbox=dynamic_cast<Gtk::HBox*>(widget); auto hbox=dynamic_cast<Gtk::Box*>(widget);
for(size_t c=0;c<hboxes.size();++c) { for(size_t c=0;c<hboxes.size();++c) {
if(hboxes[c].get()==hbox) { if(hboxes[c].get()==hbox) {
focus_view(source_views[c]); focus_view(source_views[c]);
@ -72,7 +72,7 @@ Notebook::Notebook() : Gtk::HPaned(), notebooks(2) {
last_index=-1; last_index=-1;
}); });
notebook.signal_page_added().connect([this](Gtk::Widget* widget, guint) { notebook.signal_page_added().connect([this](Gtk::Widget* widget, guint) {
auto hbox=dynamic_cast<Gtk::HBox*>(widget); auto hbox=dynamic_cast<Gtk::Box*>(widget);
for(size_t c=0;c<hboxes.size();++c) { for(size_t c=0;c<hboxes.size();++c) {
if(hboxes[c].get()==hbox) { if(hboxes[c].get()==hbox) {
focus_view(source_views[c]); focus_view(source_views[c]);
@ -279,7 +279,7 @@ void Notebook::open(const boost::filesystem::path &file_path, size_t notebook_in
}; };
scrolled_windows.emplace_back(new Gtk::ScrolledWindow()); scrolled_windows.emplace_back(new Gtk::ScrolledWindow());
hboxes.emplace_back(new Gtk::HBox()); hboxes.emplace_back(new Gtk::Box());
scrolled_windows.back()->add(*source_views.back()); scrolled_windows.back()->add(*source_views.back());
hboxes.back()->pack_start(*scrolled_windows.back()); hboxes.back()->pack_start(*scrolled_windows.back());
@ -643,7 +643,7 @@ Source::View *Notebook::get_view(size_t notebook_index, int page) {
if(notebook_index==static_cast<size_t>(-1) || notebook_index>=notebooks.size() || if(notebook_index==static_cast<size_t>(-1) || notebook_index>=notebooks.size() ||
page<0 || page>=notebooks[notebook_index].get_n_pages()) page<0 || page>=notebooks[notebook_index].get_n_pages())
return nullptr; return nullptr;
auto hbox=dynamic_cast<Gtk::HBox*>(notebooks[notebook_index].get_nth_page(page)); auto hbox=dynamic_cast<Gtk::Box*>(notebooks[notebook_index].get_nth_page(page));
auto scrolled_window=dynamic_cast<Gtk::ScrolledWindow*>(hbox->get_children()[0]); auto scrolled_window=dynamic_cast<Gtk::ScrolledWindow*>(hbox->get_children()[0]);
return dynamic_cast<Source::View*>(scrolled_window->get_children()[0]); return dynamic_cast<Source::View*>(scrolled_window->get_children()[0]);
} }

4
src/notebook.h
Unescape View File

@ -9,7 +9,7 @@
#include <map> #include <map>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
class Notebook : public Gtk::HPaned { class Notebook : public Gtk::Paned {
class TabLabel : public Gtk::EventBox { class TabLabel : public Gtk::EventBox {
public: public:
TabLabel(const boost::filesystem::path &path, std::function<void()> on_close); TabLabel(const boost::filesystem::path &path, std::function<void()> on_close);
@ -75,7 +75,7 @@ private:
std::vector<Source::View*> source_views; //Is NOT freed in destructor, this is intended for quick program exit. std::vector<Source::View*> source_views; //Is NOT freed in destructor, this is intended for quick program exit.
std::vector<std::unique_ptr<Gtk::Widget> > source_maps; std::vector<std::unique_ptr<Gtk::Widget> > source_maps;
std::vector<std::unique_ptr<Gtk::ScrolledWindow> > scrolled_windows; std::vector<std::unique_ptr<Gtk::ScrolledWindow> > scrolled_windows;
std::vector<std::unique_ptr<Gtk::HBox> > hboxes; std::vector<std::unique_ptr<Gtk::Box> > hboxes;
std::vector<std::unique_ptr<TabLabel> > tab_labels; std::vector<std::unique_ptr<TabLabel> > tab_labels;
bool split=false; bool split=false;

2
src/project.cc
Unescape View File

@ -185,7 +185,7 @@ Project::Clang::DebugOptions::DebugOptions() : Base::DebugOptions() {
set_visible(false); set_visible(false);
}); });
auto remote_vbox=Gtk::manage(new Gtk::VBox()); auto remote_vbox=Gtk::manage(new Gtk::Box(Gtk::Orientation::ORIENTATION_VERTICAL));
remote_vbox->pack_start(remote_enabled, true, true); remote_vbox->pack_start(remote_enabled, true, true);
remote_vbox->pack_end(remote_host, true, true); remote_vbox->pack_end(remote_host, true, true);

4
src/project.h
Unescape View File

@ -31,9 +31,9 @@ namespace Project {
#ifdef JUCI_ENABLE_DEBUG #ifdef JUCI_ENABLE_DEBUG
class DebugOptions : public Gtk::Popover { class DebugOptions : public Gtk::Popover {
public: public:
DebugOptions() : Gtk::Popover() { add(vbox); } DebugOptions() : Gtk::Popover(), vbox(Gtk::Orientation::ORIENTATION_VERTICAL) { add(vbox); }
protected: protected:
Gtk::VBox vbox; Gtk::Box vbox;
}; };
#endif #endif
public: public:

2
src/selectiondialog.cc
Unescape View File

@ -44,7 +44,7 @@ void SelectionDialogBase::ListViewText::clear() {
} }
SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, bool show_search_entry, bool use_markup): SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, bool show_search_entry, bool use_markup):
text_view(text_view), window(Gtk::WindowType::WINDOW_POPUP), list_view_text(use_markup), start_mark(start_mark), show_search_entry(show_search_entry) { text_view(text_view), window(Gtk::WindowType::WINDOW_POPUP), vbox(Gtk::Orientation::ORIENTATION_VERTICAL), list_view_text(use_markup), start_mark(start_mark), show_search_entry(show_search_entry) {
auto g_application=g_application_get_default(); auto g_application=g_application_get_default();
auto gio_application=Glib::wrap(g_application, true); auto gio_application=Glib::wrap(g_application, true);
auto application=Glib::RefPtr<Gtk::Application>::cast_static(gio_application); auto application=Glib::RefPtr<Gtk::Application>::cast_static(gio_application);

2
src/selectiondialog.h
Unescape View File

@ -50,7 +50,7 @@ protected:
void resize(); void resize();
Gtk::TextView& text_view; Gtk::TextView& text_view;
Gtk::Window window; Gtk::Window window;
Gtk::VBox vbox; Gtk::Box vbox;
Gtk::ScrolledWindow scrolled_window; Gtk::ScrolledWindow scrolled_window;
ListViewText list_view_text; ListViewText list_view_text;
SearchEntry search_entry; SearchEntry search_entry;

20
src/window.cc
Unescape View File

@ -37,27 +37,27 @@ Window::Window() {
auto directories_scrolled_window=Gtk::manage(new Gtk::ScrolledWindow()); auto directories_scrolled_window=Gtk::manage(new Gtk::ScrolledWindow());
directories_scrolled_window->add(Directories::get()); directories_scrolled_window->add(Directories::get());
auto notebook_vbox=Gtk::manage(new Gtk::VBox()); auto notebook_vbox=Gtk::manage(new Gtk::Box(Gtk::Orientation::ORIENTATION_VERTICAL));
notebook_vbox->pack_start(Notebook::get()); notebook_vbox->pack_start(Notebook::get());
notebook_vbox->pack_end(EntryBox::get(), Gtk::PACK_SHRINK); notebook_vbox->pack_end(EntryBox::get(), Gtk::PACK_SHRINK);
auto terminal_scrolled_window=Gtk::manage(new Gtk::ScrolledWindow()); auto terminal_scrolled_window=Gtk::manage(new Gtk::ScrolledWindow());
terminal_scrolled_window->add(Terminal::get()); terminal_scrolled_window->add(Terminal::get());
auto notebook_and_terminal_vpaned=Gtk::manage(new Gtk::VPaned()); auto notebook_and_terminal_vpaned=Gtk::manage(new Gtk::Paned(Gtk::Orientation::ORIENTATION_VERTICAL));
notebook_and_terminal_vpaned->set_position(static_cast<int>(0.75*Config::get().window.default_size.second)); notebook_and_terminal_vpaned->set_position(static_cast<int>(0.75*Config::get().window.default_size.second));
notebook_and_terminal_vpaned->pack1(*notebook_vbox, Gtk::SHRINK); notebook_and_terminal_vpaned->pack1(*notebook_vbox, Gtk::SHRINK);
notebook_and_terminal_vpaned->pack2(*terminal_scrolled_window, Gtk::SHRINK); notebook_and_terminal_vpaned->pack2(*terminal_scrolled_window, Gtk::SHRINK);
auto hpaned=Gtk::manage(new Gtk::HPaned()); auto hpaned=Gtk::manage(new Gtk::Paned());
hpaned->set_position(static_cast<int>(0.2*Config::get().window.default_size.first)); hpaned->set_position(static_cast<int>(0.2*Config::get().window.default_size.first));
hpaned->pack1(*directories_scrolled_window, Gtk::SHRINK); hpaned->pack1(*directories_scrolled_window, Gtk::SHRINK);
hpaned->pack2(*notebook_and_terminal_vpaned, Gtk::SHRINK); hpaned->pack2(*notebook_and_terminal_vpaned, Gtk::SHRINK);
auto status_hbox=Gtk::manage(new Gtk::HBox()); auto status_hbox=Gtk::manage(new Gtk::Box());
status_hbox->set_homogeneous(true); status_hbox->set_homogeneous(true);
status_hbox->pack_start(*Gtk::manage(new Gtk::HBox())); status_hbox->pack_start(*Gtk::manage(new Gtk::Box()));
auto status_right_hbox=Gtk::manage(new Gtk::HBox()); auto status_right_hbox=Gtk::manage(new Gtk::Box());
status_right_hbox->pack_end(Notebook::get().status_state, Gtk::PACK_SHRINK); status_right_hbox->pack_end(Notebook::get().status_state, Gtk::PACK_SHRINK);
auto status_right_overlay=Gtk::manage(new Gtk::Overlay()); auto status_right_overlay=Gtk::manage(new Gtk::Overlay());
status_right_overlay->add(*status_right_hbox); status_right_overlay->add(*status_right_hbox);
@ -66,19 +66,19 @@ Window::Window() {
auto status_overlay=Gtk::manage(new Gtk::Overlay()); auto status_overlay=Gtk::manage(new Gtk::Overlay());
status_overlay->add(*status_hbox); status_overlay->add(*status_hbox);
auto status_file_info_hbox=Gtk::manage(new Gtk::HBox); auto status_file_info_hbox=Gtk::manage(new Gtk::Box);
status_file_info_hbox->pack_start(Notebook::get().status_file_path, Gtk::PACK_SHRINK); status_file_info_hbox->pack_start(Notebook::get().status_file_path, Gtk::PACK_SHRINK);
status_file_info_hbox->pack_start(Notebook::get().status_branch, Gtk::PACK_SHRINK); status_file_info_hbox->pack_start(Notebook::get().status_branch, Gtk::PACK_SHRINK);
status_file_info_hbox->pack_start(Notebook::get().status_location, Gtk::PACK_SHRINK); status_file_info_hbox->pack_start(Notebook::get().status_location, Gtk::PACK_SHRINK);
status_overlay->add_overlay(*status_file_info_hbox); status_overlay->add_overlay(*status_file_info_hbox);
status_overlay->add_overlay(Project::debug_status_label()); status_overlay->add_overlay(Project::debug_status_label());
auto vbox=Gtk::manage(new Gtk::VBox()); auto vbox=Gtk::manage(new Gtk::Box(Gtk::Orientation::ORIENTATION_VERTICAL));
vbox->pack_start(*hpaned); vbox->pack_start(*hpaned);
vbox->pack_start(*status_overlay, Gtk::PACK_SHRINK); vbox->pack_start(*status_overlay, Gtk::PACK_SHRINK);
auto overlay_vbox=Gtk::manage(new Gtk::VBox()); auto overlay_vbox=Gtk::manage(new Gtk::Box(Gtk::Orientation::ORIENTATION_VERTICAL));
auto overlay_hbox=Gtk::manage(new Gtk::HBox()); auto overlay_hbox=Gtk::manage(new Gtk::Box());
overlay_vbox->set_hexpand(false); overlay_vbox->set_hexpand(false);
overlay_vbox->set_halign(Gtk::Align::ALIGN_START); overlay_vbox->set_halign(Gtk::Align::ALIGN_START);
overlay_vbox->pack_start(Info::get(), Gtk::PACK_SHRINK, 20); overlay_vbox->pack_start(Info::get(), Gtk::PACK_SHRINK, 20);

Write Preview
Loading…
Cancel
Save