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

Remove compile conditions for value getting/setting part4 #433

Merged
merged 1 commit into from
Aug 1, 2020
Merged

Remove compile conditions for value getting/setting part4 #433

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
25 changes: 0 additions & 25 deletions src/fontcolorpref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,12 @@ void FontColorPref::pack_widget()
m_hbox_change_color.pack_end( m_bt_change_color , Gtk::PACK_SHRINK );
m_vbox_color.pack_start( m_hbox_change_color, Gtk::PACK_SHRINK );

#if GTKMM_CHECK_VERSION(3,0,0)
m_chk_use_gtktheme_message.add_label( "書き込みビューの配色設定に GTKテーマ を用いる(_W)", true );
m_chk_use_gtktheme_message.set_active( CONFIG::get_use_message_gtktheme() );
m_vbox_color.pack_start( m_chk_use_gtktheme_message, Gtk::PACK_SHRINK );
#endif

m_chk_use_gtkrc_tree.add_label( "ツリービューの背景色設定に gtkrc を用いる(_T)", true ),
m_chk_use_gtkrc_tree.set_active( CONFIG::get_use_tree_gtkrc() );
m_chk_use_gtkrc_tree.signal_toggled().connect( sigc::mem_fun( *this, &FontColorPref::slot_chk_use_gtkrc_toggled ) );
m_vbox_color.pack_start( m_chk_use_gtkrc_tree, Gtk::PACK_SHRINK );

m_chk_use_gtkrc_selection.add_label( "スレビューの選択範囲の色設定に gtkrc を用いる(_S)", true ),
Expand Down Expand Up @@ -262,9 +259,7 @@ void FontColorPref::slot_ok_clicked()

CONFIG::set_strict_char_width( m_checkbutton_font.property_active() );

#if GTKMM_CHECK_VERSION(3,0,0)
CONFIG::set_use_message_gtktheme( m_chk_use_gtktheme_message.property_active() );
#endif
CONFIG::set_use_tree_gtkrc( m_chk_use_gtkrc_tree.property_active() );
CONFIG::set_use_select_gtkrc( m_chk_use_gtkrc_selection.property_active() );

Expand Down Expand Up @@ -340,17 +335,6 @@ void FontColorPref::slot_checkbutton_font_toggled()
}
}

void FontColorPref::slot_chk_use_gtkrc_toggled()
{
#if !GTKMM_CHECK_VERSION(3,0,0)
if( m_chk_use_gtkrc_tree.property_active() )
{
SKELETON::MsgDiag mdiag( nullptr, WARNING_GTKRC_TREE );
mdiag.run();
}
#endif
}


//
// フォント選択ダイアログで OK が押された
Expand Down Expand Up @@ -523,16 +507,7 @@ void FontColorPref::slot_reset_color()
//
void FontColorPref::slot_reset_all_colors()
{
#if !GTKMM_CHECK_VERSION(3,0,0)
if( m_chk_use_gtkrc_tree.property_active() )
{
SKELETON::MsgDiag mdiag( nullptr, WARNING_GTKRC_TREE );
mdiag.run();
}
#endif
#if GTKMM_CHECK_VERSION(3,0,0)
m_chk_use_gtktheme_message.set_active( CONFIG::CONF_USE_MESSAGE_GTKTHEME );
#endif
m_chk_use_gtkrc_tree.set_active( CONFIG::CONF_USE_TREE_GTKRC );
m_chk_use_gtkrc_selection.set_active( CONFIG::CONF_USE_SELECT_GTKRC );

Expand Down
3 changes: 0 additions & 3 deletions src/fontcolorpref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ namespace CORE
Gtk::Label m_label_warning_color;
Gtk::VBox m_vbox_color;

#if GTKMM_CHECK_VERSION(3,0,0)
Gtk::CheckButton m_chk_use_gtktheme_message;
#endif
Gtk::CheckButton m_chk_use_gtkrc_tree;
Gtk::CheckButton m_chk_use_gtkrc_selection;

Expand Down Expand Up @@ -94,7 +92,6 @@ namespace CORE
void slot_combo_font_changed();
void slot_fontbutton_on_set();
void slot_checkbutton_font_toggled();
void slot_chk_use_gtkrc_toggled();
void slot_reset_font();

// 色の設定
Expand Down