quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* shortcuts list: add Reset All button (defaults all shortcuts)

Browse Source
This commit is contained in:
Garux 2020-03-10 05:09:32 +03:00
parent b122d19ec7
commit a4b61f88e5
1 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
radiant/commands.cpp
View File

@ -227,12 +227,10 @@ void accelerator_edit_button_clicked( GtkButton *btn, gpointer dialogptr ){
GtkTreeSelection *sel = gtk_tree_view_get_selection( dialog.m_list ); GtkTreeSelection *sel = gtk_tree_view_get_selection( dialog.m_list );
GtkTreeModel *model; GtkTreeModel *model;
GtkTreeIter iter; GtkTreeIter iter;
if ( !gtk_tree_selection_get_selected( sel, &model, &iter ) ) { if ( gtk_tree_selection_get_selected( sel, &model, &iter ) ) {
return;
}
dialog.stopWaitForKey(); dialog.stopWaitForKey();
dialog.startWaitForKey( iter, model ); dialog.startWaitForKey( iter, model );
}
} }
gboolean accelerator_tree_butt_press( GtkWidget* widget, GdkEventButton* event, gpointer dialogptr ){ gboolean accelerator_tree_butt_press( GtkWidget* widget, GdkEventButton* event, gpointer dialogptr ){
@ -273,18 +271,14 @@ public:
// empty the cell of the key binds dialog // empty the cell of the key binds dialog
GtkTreeIter i; GtkTreeIter i;
if ( gtk_tree_model_get_iter_first( model, &i ) ) { if ( gtk_tree_model_get_iter_first( model, &i ) ) {
for (;; ) do{
{
gchar* thisName = nullptr; gchar* thisName = nullptr;
gtk_tree_model_get( model, &i, 0, &thisName, -1 ); gtk_tree_model_get( model, &i, 0, &thisName, -1 );
if ( !strcmp( thisName, name ) ) { if ( !strcmp( thisName, name ) ) {
gtk_list_store_set( GTK_LIST_STORE( model ), &i, 1, "", -1 ); gtk_list_store_set( GTK_LIST_STORE( model ), &i, 1, "", -1 );
} }
g_free( thisName ); g_free( thisName );
if ( !gtk_tree_model_iter_next( model, &i ) ) { } while( gtk_tree_model_iter_next( model, &i ) );
break;
}
}
} }
} }
else if ( r == eIDCANCEL ) { else if ( r == eIDCANCEL ) {
@ -380,6 +374,47 @@ void accelerator_reset_button_clicked( GtkButton *btn, gpointer dialogptr ){
} }
} }
void accelerator_reset_all_button_clicked( GtkButton *btn, gpointer dialogptr ){
command_list_dialog_t &dialog = *(command_list_dialog_t *) dialogptr;
if ( dialog.stopWaitForKey() ) // just unhighlight, user wanted to cancel
return;
for ( auto& pair : g_shortcuts ){ // at first disconnect all to avoid conflicts during connecting
if( !( pair.second.accelerator == pair.second.accelerator_default ) ){ // can just do this for all, but it breaks menu accelerator labels :b
// clear the ACTUAL accelerator
disconnect_accelerator( pair.first.c_str() );
}
}
for ( auto& pair : g_shortcuts ){
if( !( pair.second.accelerator == pair.second.accelerator_default ) ){
pair.second.accelerator = pair.second.accelerator_default;
// set the ACTUAL accelerator
connect_accelerator( pair.first.c_str() );
}
}
// update tree view
GtkTreeModel* model = gtk_tree_view_get_model( dialog.m_list );
if( model ){
GtkTreeIter i;
if ( gtk_tree_model_get_iter_first( model, &i ) ) {
do{
gchar* commandName = nullptr;
gtk_tree_model_get( model, &i, 0, &commandName, -1 );
Shortcuts::iterator thisShortcutIterator = g_shortcuts.find( commandName );
if ( thisShortcutIterator != g_shortcuts.end() ) {
// write into the cell
StringOutputStream modifiers;
modifiers << thisShortcutIterator->second.accelerator;
gtk_list_store_set( GTK_LIST_STORE( model ), &i, 1, modifiers.c_str(), -1 );
}
g_free( commandName );
} while( gtk_tree_model_iter_next( model, &i ) );
}
}
}
static gboolean mid_search_func( GtkTreeModel* model, gint column, const gchar* key, GtkTreeIter* iter, gpointer search_data ) { static gboolean mid_search_func( GtkTreeModel* model, gint column, const gchar* key, GtkTreeIter* iter, gpointer search_data ) {
gchar* iter_string = 0; gchar* iter_string = 0;
gtk_tree_model_get( model, iter, column, &iter_string, -1 ); gtk_tree_model_get( model, iter, column, &iter_string, -1 );
@ -476,6 +511,9 @@ void DoCommandListDlg(){
GtkButton* resetbutton = create_dialog_button( "Reset", (GCallback) accelerator_reset_button_clicked, &dialog ); GtkButton* resetbutton = create_dialog_button( "Reset", (GCallback) accelerator_reset_button_clicked, &dialog );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( resetbutton ), FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( resetbutton ), FALSE, FALSE, 0 );
GtkButton* resetallbutton = create_dialog_button( "Reset All", (GCallback) accelerator_reset_all_button_clicked, &dialog );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( resetallbutton ), FALSE, FALSE, 0 );
GtkWidget *spacer = gtk_image_new(); GtkWidget *spacer = gtk_image_new();
gtk_widget_show( spacer ); gtk_widget_show( spacer );
gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( spacer ), TRUE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( spacer ), TRUE, TRUE, 0 );