Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Gtk::Dialog::get_content_area() instead of get_vbox() part3 #467

Merged
merged 1 commit into from
Sep 19, 2020
Merged

Use Gtk::Dialog::get_content_area() instead of get_vbox() part3 #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/privacypref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ namespace CORE
m_hbox_selectall.pack_start( m_bt_selectall, Gtk::PACK_SHRINK );
m_vbox.pack_start( m_hbox_selectall, Gtk::PACK_SHRINK );

get_vbox()->set_spacing( 8 );
get_vbox()->pack_start( m_vbox, Gtk::PACK_SHRINK );
get_content_area()->set_spacing( 8 );
get_content_area()->pack_start( m_vbox, Gtk::PACK_SHRINK );

set_title( "プライバシー情報の消去" );
show_all_children();
Expand Down
10 changes: 5 additions & 5 deletions src/proxypref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ namespace CORE
set_activate_entry( m_frame_data.entry_host );
set_activate_entry( m_frame_data.entry_port );

get_vbox()->set_spacing( 4 );
get_vbox()->pack_start( m_label );
get_vbox()->pack_start( m_frame_2ch );
get_vbox()->pack_start( m_frame_2ch_w );
get_vbox()->pack_start( m_frame_data );
get_content_area()->set_spacing( 4 );
get_content_area()->pack_start( m_label );
get_content_area()->pack_start( m_frame_2ch );
get_content_area()->pack_start( m_frame_2ch_w );
get_content_area()->pack_start( m_frame_data );

set_title( "プロキシ設定" );
show_all_children();
Expand Down
2 changes: 1 addition & 1 deletion src/setupwizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ SetupWizard::SetupWizard()
m_notebook.set_show_tabs( false );
m_sigc_switch_page = m_notebook.signal_switch_page().connect( sigc::mem_fun( *this, &SetupWizard::slot_switch_page ) );

get_vbox()->pack_start( m_notebook, Gtk::PACK_EXPAND_PADDING, SPACING_SIZE );
get_content_area()->pack_start( m_notebook, Gtk::PACK_EXPAND_PADDING, SPACING_SIZE );

show_all_children();
}
Expand Down
2 changes: 1 addition & 1 deletion src/skeleton/aboutdiag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void AboutDiag::init()
m_hbuttonbox_environment.pack_start( m_button_copy_environment, Gtk::PACK_SHRINK );
m_vbox_environment.pack_start( m_hbuttonbox_environment, Gtk::PACK_SHRINK );

get_vbox()->pack_start( m_notebook, Gtk::PACK_EXPAND_WIDGET, MARGIN );
get_content_area()->pack_start( m_notebook, Gtk::PACK_EXPAND_WIDGET, MARGIN );

show_all_children();

Expand Down
2 changes: 1 addition & 1 deletion src/skeleton/detaildiag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ DetailDiag::DetailDiag( Gtk::Window* parent, const std::string& url,
m_notebook.append_page( *m_detail, tab_detail );
m_notebook.signal_switch_page().connect( sigc::mem_fun( *this, &DetailDiag::slot_switch_page ) );

get_vbox()->pack_start( m_notebook );
get_content_area()->pack_start( m_notebook );

show_all_children();
grab_ok();
Expand Down
2 changes: 1 addition & 1 deletion src/skeleton/editviewdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace SKELETON
m_edit.set_editable( editable );

add_button( Gtk::Stock::OK, Gtk::RESPONSE_OK );
get_vbox()->pack_start( m_edit );
get_content_area()->pack_start( m_edit );
set_title( title );
show_all_children();

Expand Down
2 changes: 1 addition & 1 deletion src/skeleton/msgdiag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ MsgCheckDiag::MsgCheckDiag( Gtk::Window* parent,

Gtk::HBox* hbox = Gtk::manage( new Gtk::HBox );
hbox->pack_start( m_chkbutton, Gtk::PACK_EXPAND_WIDGET, mrg );
get_vbox()->pack_start( *hbox, Gtk::PACK_SHRINK );
get_content_area()->pack_start( *hbox, Gtk::PACK_SHRINK );

Gtk::Button* button = nullptr;

Expand Down
4 changes: 2 additions & 2 deletions src/skeleton/selectitempref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ void SelectItemPref::pack_widgets()

m_hbox.pack_start( m_scroll_hidden, Gtk::PACK_EXPAND_WIDGET );

get_vbox()->set_spacing( 8 );
get_vbox()->pack_start( m_hbox );
get_content_area()->set_spacing( 8 );
get_content_area()->pack_start( m_hbox );

show_all_children();
}
Expand Down
4 changes: 2 additions & 2 deletions src/usrcmdmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ class ReplaceTextDiag : public SKELETON::PrefDiag
m_vbox.pack_start( m_label, Gtk::PACK_SHRINK );
m_vbox.pack_start( m_entry, Gtk::PACK_SHRINK );

get_vbox()->set_spacing( 8 );
get_vbox()->pack_start( m_vbox );
get_content_area()->set_spacing( 8 );
get_content_area()->pack_start( m_vbox );

set_title( "テキスト入力" );
show_all_children();
Expand Down
12 changes: 6 additions & 6 deletions src/usrcmdpref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ UsrCmdDiag::UsrCmdDiag( Gtk::Window* parent, const Glib::ustring& name, const Gl
m_vbox.pack_start( m_hbox_cmd, Gtk::PACK_SHRINK );
m_vbox.pack_start( m_entry_cmd, Gtk::PACK_SHRINK );

get_vbox()->set_spacing( 8 );
get_vbox()->pack_start( m_vbox );
get_content_area()->set_spacing( 8 );
get_content_area()->pack_start( m_vbox );

set_activate_entry( m_entry_name );
set_activate_entry( m_entry_cmd );
Expand Down Expand Up @@ -87,12 +87,12 @@ UsrCmdPref::UsrCmdPref( Gtk::Window* parent, const std::string& url )
m_scrollwin.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS );
m_scrollwin.set_size_request( 640, 400 );

get_vbox()->set_spacing( 8 );
get_vbox()->pack_start( m_label, Gtk::PACK_SHRINK );
get_vbox()->pack_start( m_scrollwin );
get_content_area()->set_spacing( 8 );
get_content_area()->pack_start( m_label, Gtk::PACK_SHRINK );
get_content_area()->pack_start( m_scrollwin );

m_ckbt_hide_usrcmd.set_active( CONFIG::get_hide_usrcmd() );
get_vbox()->pack_start( m_ckbt_hide_usrcmd, Gtk::PACK_SHRINK );
get_content_area()->pack_start( m_ckbt_hide_usrcmd, Gtk::PACK_SHRINK );

// ポップアップメニュー
m_action_group = Gtk::ActionGroup::create();
Expand Down