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.

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

BBSListViewBase: Update context menu construction to use Gio::Menu #1003

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions src/bbslist/bbslistview.cpp
Expand Up @@ -215,21 +215,21 @@ Gtk::Menu* BBSListViewMain::get_popupmenu( const std::string& url )
#endif

if( type == TYPE_DIR ){
if( is_etcdir( path ) ) popupmenu = id2popupmenu( "/popup_menu_etcdir" );
else popupmenu = id2popupmenu( "/popup_menu_dir" );
if( is_etcdir( path ) ) popupmenu = id2popupmenu( "popup_menu_etcdir" );
else popupmenu = id2popupmenu( "popup_menu_dir" );
}
else if( type == TYPE_BOARD || type == TYPE_BOARD_UPDATE ){
if( is_etcboard( path ) ) popupmenu = id2popupmenu( "/popup_menu_etc" );
else popupmenu = id2popupmenu( "/popup_menu" );
if( is_etcboard( path ) ) popupmenu = id2popupmenu( "popup_menu_etc" );
else popupmenu = id2popupmenu( "popup_menu" );
}
}
else{

const bool have_etc = std::all_of( list_it.cbegin(), list_it.cend(),
[this]( const Gtk::TreeIter& iter ) { return is_etcboard( iter ); } );

if( have_etc ) popupmenu = id2popupmenu( "/popup_menu_mul_etc" );
else popupmenu = id2popupmenu( "/popup_menu_mul" );
if( have_etc ) popupmenu = id2popupmenu( "popup_menu_mul_etc" );
else popupmenu = id2popupmenu( "popup_menu_mul" );
}

return popupmenu;
Expand Down