mirror of https://github.com/daleclack/My_GtkUi
Fix finder
This commit is contained in:
parent
e5216e1249
commit
8130bc8813
|
@ -20,7 +20,7 @@
|
|||
<object class="GtkImage" id="image1">
|
||||
<property name="pixel-size">48</property>
|
||||
<property name="icon-name">My_GtkUI</property>
|
||||
<property name="icon_size">6</property>
|
||||
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -136,7 +136,7 @@
|
|||
<object class="GtkImage" id="image23">
|
||||
<property name="pixel-size">48</property>
|
||||
<property name="icon-name">24game</property>
|
||||
<property name="icon_size">6</property>
|
||||
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -149,7 +149,7 @@
|
|||
<property name="child">
|
||||
<object class="GtkImage" id="image26">
|
||||
<property name="icon-name">mines_app</property>
|
||||
<property name="icon_size">6</property>
|
||||
<property name="pixel-size">48</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -307,7 +307,7 @@
|
|||
<property name="vexpand">0</property>
|
||||
<property name="pixel-size">48</property>
|
||||
<property name="icon-name">btnabout</property>
|
||||
<property name="icon_size">6</property>
|
||||
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -329,7 +329,7 @@
|
|||
<property name="pixel-size">48</property>
|
||||
<property name="icon-name">
|
||||
audacious_whitesur</property>
|
||||
<property name="icon_size">6</property>
|
||||
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -421,7 +421,7 @@
|
|||
<object class="GtkImage" id="image14">
|
||||
<property name="pixel-size">48</property>
|
||||
<property name="icon-name">image_app</property>
|
||||
<property name="icon_size">6</property>
|
||||
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -550,7 +550,7 @@
|
|||
<object class="GtkImage" id="image22">
|
||||
<property name="pixel-size">48</property>
|
||||
<property name="icon-name">24game</property>
|
||||
<property name="icon_size">6</property>
|
||||
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -569,7 +569,6 @@
|
|||
<object class="GtkImage" id="image24">
|
||||
<property name="pixel-size">48</property>
|
||||
<property name="icon-name">calcapp</property>
|
||||
<property name="icon_size">6</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
@ -588,7 +587,7 @@
|
|||
<property name="child">
|
||||
<object class="GtkImage" id="image27">
|
||||
<property name="icon-name">mines_app</property>
|
||||
<property name="icon_size">6</property>
|
||||
<property name="pixel-size">48</property>
|
||||
</object>
|
||||
</property>
|
||||
<property name="has-frame">0</property>
|
||||
|
|
|
@ -14,7 +14,7 @@ public:
|
|||
MineCell()
|
||||
{
|
||||
// Set button style
|
||||
set_relief(Gtk::RELIEF_NONE);
|
||||
set_has_frame(false);
|
||||
mines_around = 0;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -16,7 +16,7 @@ MyStack::MyStack()
|
|||
|
||||
void MyStack::mystack_init(Gtk::Window *window, Gtk::Image *m_back)
|
||||
{
|
||||
// main_dock->mydock_init(window, m_back);
|
||||
main_dock->mydock_init(window, m_back);
|
||||
}
|
||||
|
||||
void MyStack::show_prefs()
|
||||
|
|
|
@ -10,13 +10,14 @@ MyWin::MyWin()
|
|||
set_icon_name("My_GtkUI");
|
||||
set_title("My GtkUI macOS Version");
|
||||
// get_size_config(width, height, panel_mode);
|
||||
panel_mode = true;
|
||||
|
||||
// Set the display mode of dock
|
||||
// if(panel_mode){
|
||||
// main_stack.set_mydock_mode(DockMode::MODE_PANEL);
|
||||
// }else{
|
||||
// main_stack.set_mydock_mode(DockMode::MODE_DOCK);
|
||||
// }
|
||||
if(panel_mode){
|
||||
main_stack.set_mydock_mode(DockMode::MODE_PANEL);
|
||||
}else{
|
||||
main_stack.set_mydock_mode(DockMode::MODE_DOCK);
|
||||
}
|
||||
|
||||
// Add background
|
||||
// auto pixbuf = Gdk::Pixbuf::create_from_xpm_data(winpe);
|
||||
|
@ -51,7 +52,7 @@ MyWin::MyWin()
|
|||
gesture->signal_pressed().connect(sigc::mem_fun(*this, &MyWin::press));
|
||||
|
||||
// Initalize Stack
|
||||
// main_stack.mystack_init(this, &m_background);
|
||||
main_stack.mystack_init(this, &m_background);
|
||||
|
||||
set_child(m_overlay);
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ show_hidden("Show hidden files")
|
|||
|
||||
m_toolbar.set_toolbar_style(Gtk::TOOLBAR_ICONS);
|
||||
btnbox.append(m_toolbar,Gtk::PACK_SHRINK);
|
||||
btnbox.pack_end(m_viewbar,Gtk::PACK_SHRINK);
|
||||
btnbox.prepend(m_viewbar,Gtk::PACK_SHRINK);
|
||||
|
||||
//"Up" Button
|
||||
up_button.set_icon_name("go-up");
|
||||
|
@ -57,14 +57,14 @@ show_hidden("Show hidden files")
|
|||
//"View Mode" Button
|
||||
view_item.add(view_button);
|
||||
view_mode=ViewMode::MODE_ICON;
|
||||
view_button.set_relief(Gtk::RELIEF_NONE);
|
||||
view_button.set_has_frame(false);
|
||||
view_button.set_image_from_icon_name("view-grid-symbolic",Gtk::ICON_SIZE_LARGE_TOOLBAR);
|
||||
view_button.signal_clicked().connect(sigc::mem_fun(*this,&FileWindow::btnview_clicked));
|
||||
m_viewbar.insert(view_item,-1);
|
||||
|
||||
//Menu Button
|
||||
menu_item.add(menubtn);
|
||||
menubtn.set_relief(Gtk::RELIEF_NONE);
|
||||
menubtn.set_has_frame(false);
|
||||
m_viewbar.insert(menu_item,-1);
|
||||
m_viewbar.set_toolbar_style(Gtk::TOOLBAR_ICONS);
|
||||
show_hidden.set_active(false);
|
||||
|
|
|
@ -22,7 +22,7 @@ ImageApp::ImageApp()
|
|||
scale.signal_value_changed().connect(sigc::mem_fun(*this, &ImageApp::scale_changed));
|
||||
|
||||
// Add control widgets
|
||||
btnopen.set_relief(Gtk::RELIEF_NONE);
|
||||
btnopen.set_has_frame(false);
|
||||
btnbox.append(scale);
|
||||
btnbox.append(btnopen);
|
||||
main_box.append(btnbox);
|
||||
|
|
|
@ -12,7 +12,7 @@ MineSweeper::MineSweeper()
|
|||
set_titlebar(header);
|
||||
header.set_show_close_button();
|
||||
header.set_decoration_layout("close,minimize,maximize:menu");
|
||||
header.pack_end(menu_btn);
|
||||
header.prepend(menu_btn);
|
||||
set_icon_name("org.gtk.daleclack");
|
||||
|
||||
// Initalize Menu
|
||||
|
@ -211,7 +211,7 @@ bool MineSweeper::timer_func()
|
|||
|
||||
void MineSweeper::cell_clicked(MineCell *cell1)
|
||||
{
|
||||
cell1->set_relief(Gtk::RELIEF_NONE);
|
||||
cell1->set_has_frame(false);
|
||||
if (!game_ended && !cell1->cleared)
|
||||
{
|
||||
//
|
||||
|
@ -261,7 +261,7 @@ void MineSweeper::check_mines(int pos_x, int pos_y)
|
|||
}
|
||||
|
||||
// make the cell without mines cleared
|
||||
cell[pos_y * 7 + pos_x].set_relief(Gtk::RELIEF_NONE);
|
||||
cell[pos_y * 7 + pos_x].set_has_frame(false);
|
||||
cell[pos_y * 7 + pos_x].cleared = true;
|
||||
|
||||
// Check the cells around a cell that has no mines
|
||||
|
|
|
@ -33,8 +33,8 @@ TextEditor::TextEditor()
|
|||
header.set_show_close_button();
|
||||
menubtn.set_image_from_icon_name("open-menu");
|
||||
search_button.set_image_from_icon_name("find");
|
||||
header.pack_end(menubtn);
|
||||
header.pack_end(search_button);
|
||||
header.prepend(menubtn);
|
||||
header.prepend(search_button);
|
||||
header.set_title("Simple Text Editor");
|
||||
set_titlebar(header);
|
||||
|
||||
|
|
|
@ -7,51 +7,58 @@ MyFinder::MyFinder()
|
|||
auto menubuilder = Gtk::Builder::create_from_resource("/org/gtk/daleclack/menubar.xml");
|
||||
|
||||
// Add widgets to menubox
|
||||
btnlogo.set_image_from_icon_name("My_GtkUI", Gtk::ICON_SIZE_BUTTON);
|
||||
btnlogo.set_relief(Gtk::RELIEF_NONE);
|
||||
btnlogo.set_use_popover(false);
|
||||
btnlogo.set_icon_name("My_GtkUI");
|
||||
btnlogo.set_has_frame(false);
|
||||
// btnlogo.set_use_popover(false);
|
||||
btnlogo.set_menu_model(get_menu(menubuilder, "main_menu"));
|
||||
append(btnlogo);
|
||||
|
||||
btntitle.set_label("MyFinder");
|
||||
btntitle.set_relief(Gtk::RELIEF_NONE);
|
||||
btntitle.set_use_popover(false);
|
||||
btntitle.set_has_frame(false);
|
||||
// btntitle.set_use_popover(false);
|
||||
btntitle.set_always_show_arrow(false);
|
||||
btntitle.set_menu_model(get_menu(menubuilder, "title_menu"));
|
||||
append(btntitle);
|
||||
|
||||
btnfile.set_label("File");
|
||||
btnfile.set_relief(Gtk::RELIEF_NONE);
|
||||
btnfile.set_use_popover(false);
|
||||
btnfile.set_has_frame(false);
|
||||
btnfile.set_always_show_arrow(false);
|
||||
// btnfile.set_use_popover(false);
|
||||
btnfile.set_menu_model(get_menu(menubuilder, "menu_file"));
|
||||
append(btnfile);
|
||||
|
||||
btnedit.set_label("Edit");
|
||||
btnedit.set_relief(Gtk::RELIEF_NONE);
|
||||
btnedit.set_use_popover(false);
|
||||
btnedit.set_has_frame(false);
|
||||
btnedit.set_always_show_arrow(false);
|
||||
// btnedit.set_use_popover(false);
|
||||
btnedit.set_menu_model(get_menu(menubuilder, "menu_edit"));
|
||||
append(btnedit);
|
||||
|
||||
btnshow.set_label("Show");
|
||||
btnshow.set_relief(Gtk::RELIEF_NONE);
|
||||
btnshow.set_use_popover(false);
|
||||
btnshow.set_has_frame(false);
|
||||
btnshow.set_always_show_arrow(false);
|
||||
// btnshow.set_use_popover(false);
|
||||
btnshow.set_menu_model(get_menu(menubuilder, "menu_show"));
|
||||
append(btnshow);
|
||||
|
||||
btngoto.set_label("Go to");
|
||||
btngoto.set_relief(Gtk::RELIEF_NONE);
|
||||
btngoto.set_use_popover(false);
|
||||
btngoto.set_has_frame(false);
|
||||
btngoto.set_always_show_arrow(false);
|
||||
// btngoto.set_use_popover(false);
|
||||
btngoto.set_menu_model(get_menu(menubuilder, "menu_goto"));
|
||||
append(btngoto);
|
||||
|
||||
btnwin.set_label("Windows");
|
||||
btnwin.set_relief(Gtk::RELIEF_NONE);
|
||||
btnwin.set_use_popover(false);
|
||||
btnwin.set_has_frame(false);
|
||||
btnwin.set_always_show_arrow(false);
|
||||
// btnwin.set_use_popover(false);
|
||||
btnwin.set_menu_model(get_menu(menubuilder, "menu_win"));
|
||||
append(btnwin);
|
||||
|
||||
btnhelp.set_label("Help");
|
||||
btnhelp.set_relief(Gtk::RELIEF_NONE);
|
||||
btnhelp.set_use_popover(false);
|
||||
btnhelp.set_has_frame(false);
|
||||
btnhelp.set_always_show_arrow(false);
|
||||
// btnhelp.set_use_popover(false);
|
||||
btnhelp.set_menu_model(get_menu(menubuilder, "menu_help"));
|
||||
append(btnhelp);
|
||||
|
||||
|
@ -59,51 +66,52 @@ MyFinder::MyFinder()
|
|||
set_halign(Gtk::Align::FILL);
|
||||
set_valign(Gtk::Align::START);
|
||||
|
||||
// Monitor Button
|
||||
screen_button.set_image_from_icon_name("finder-computer");
|
||||
screen_button.set_has_frame(false);
|
||||
append(screen_button);
|
||||
|
||||
// Audio Button
|
||||
audio_button.set_image_from_icon_name("finder_audio");
|
||||
audio_button.set_has_frame(false);
|
||||
append(audio_button);
|
||||
|
||||
// NetWork Button
|
||||
network_button.set_image_from_icon_name("finder-wifi");
|
||||
network_button.set_has_frame(false);
|
||||
append(network_button);
|
||||
|
||||
// finder-battery Button
|
||||
battery_button.set_image_from_icon_name("finder-battery");
|
||||
battery_button.set_has_frame(false);
|
||||
append(battery_button);
|
||||
|
||||
// Add a timer
|
||||
time_popover.add(calender);
|
||||
time_popover.set_child(calender);
|
||||
calender.show();
|
||||
calender.set_margin_bottom(5);
|
||||
calender.set_margin_end(5);
|
||||
calender.set_margin_start(5);
|
||||
calender.set_margin_end(5);
|
||||
|
||||
// Menu button
|
||||
menu_button.set_image_from_icon_name("open-menu");
|
||||
menu_button.set_relief(Gtk::RELIEF_NONE);
|
||||
pack_end(menu_button);
|
||||
|
||||
// Find Button
|
||||
find_button.set_image_from_icon_name("finder-find");
|
||||
find_button.set_relief(Gtk::RELIEF_NONE);
|
||||
pack_end(find_button);
|
||||
|
||||
// Timer
|
||||
timer_button.set_label("2022/1/23 18:32");
|
||||
timer_button.set_relief(Gtk::RELIEF_NONE);
|
||||
timer_button.set_has_frame(false);
|
||||
timer_button.set_popover(time_popover);
|
||||
pack_end(timer_button);
|
||||
timer_button.set_always_show_arrow(false);
|
||||
append(timer_button);
|
||||
|
||||
mytimer = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MyFinder::time_out), 1000);
|
||||
|
||||
// finder-battery Button
|
||||
battery_button.set_image_from_icon_name("finder-battery");
|
||||
battery_button.set_relief(Gtk::RELIEF_NONE);
|
||||
pack_end(battery_button);
|
||||
// Find Button
|
||||
find_button.set_image_from_icon_name("finder-find");
|
||||
find_button.set_has_frame(false);
|
||||
append(find_button);
|
||||
|
||||
// NetWork Button
|
||||
network_button.set_image_from_icon_name("finder-wifi");
|
||||
network_button.set_relief(Gtk::RELIEF_NONE);
|
||||
pack_end(network_button);
|
||||
|
||||
// Audio Button
|
||||
audio_button.set_image_from_icon_name("finder_audio");
|
||||
audio_button.set_relief(Gtk::RELIEF_NONE);
|
||||
pack_end(audio_button);
|
||||
|
||||
// Monitor Button
|
||||
screen_button.set_image_from_icon_name("finder-computer");
|
||||
screen_button.set_relief(Gtk::RELIEF_NONE);
|
||||
pack_end(screen_button);
|
||||
// Menu button
|
||||
menu_button.set_image_from_icon_name("open-menu");
|
||||
menu_button.set_has_frame(false);
|
||||
append(menu_button);
|
||||
|
||||
// Add Style for MyFinder
|
||||
provider = Gtk::CssProvider::create();
|
||||
|
@ -134,7 +142,6 @@ bool MyFinder::time_out()
|
|||
|
||||
Glib::RefPtr<Gio::Menu> MyFinder::get_menu(Glib::RefPtr<Gtk::Builder> &builder, const Glib::ustring &id)
|
||||
{
|
||||
auto object = builder->get_object(id);
|
||||
auto gmenu = Glib::RefPtr<Gio::Menu>::cast_dynamic(object);
|
||||
return gmenu;
|
||||
auto object = builder->get_object<Gio::Menu>(id);
|
||||
return object;
|
||||
}
|
||||
|
|
|
@ -67,7 +67,7 @@ private:
|
|||
// Page switcher and another page
|
||||
Glib::RefPtr<Gtk::Builder> stackbuilder;
|
||||
Gtk::Box *stack_box, *back_page, *winsize_page;
|
||||
Gtk::RadioButton *radio_default, *radio_custom;
|
||||
// Gtk::RadioButton *radio_default, *radio_custom;
|
||||
Gtk::ComboBoxText *combo_default;
|
||||
Gtk::SpinButton *spin_width, *spin_height;
|
||||
Gtk::Button *btnapply, *btnGet;
|
||||
|
@ -76,7 +76,7 @@ private:
|
|||
// Dock Preferences
|
||||
Gtk::Button *btnapply1;
|
||||
Gtk::CheckButton *mode_check;
|
||||
Gtk::RadioButton *radio_left, *radio_right, *radio_bottom;
|
||||
// Gtk::RadioButton *radio_left, *radio_right, *radio_bottom;
|
||||
|
||||
// Child Widgets
|
||||
Gtk::TreeView folders_view, images_view;
|
||||
|
|
Loading…
Reference in New Issue