Applications
/
ubinstall-gtk
10
0
Fork 1
Code Issues 41 Pull Requests Packages Projects Releases Wiki Activity

Test fix for keyboard navigation; Added tooltips for progress log buttons; Progress log buttons become unsensitive when log window is opened

Browse Source
pull/50/head
Ivan Dmitrievich Yartsev 1 year ago
parent 6a805d8051
commit 486874768b
6 changed files with 80 additions and 41 deletions
Show Stats Download Patch File Download Diff File

33
source/ubinstall-gtk.c
Unescape View File

@ -1047,7 +1047,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
break;
case YON_PAGE_INSTALL_ERROR:{
on_summary_log_view((GtkWidget*)NULL);
on_summary_log_view((GtkWidget*)NULL,widgets);
yon_switch_page_render(widgets,7);
gtk_widget_set_sensitive(widgets->BackButton,0);
@ -1150,8 +1150,14 @@ void *on_setup_system_configuration(void * data){
return NULL;
}
void on_log_closed(GtkWidget *, log_window *window);
void on_log_closed(GtkWidget *, log_window *window){
void on_log_closed(GtkWidget *, dictionary *dict);
void on_log_closed(GtkWidget *, dictionary *dict){
main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
log_window *window = yon_dictionary_get_data(dict->first->next,log_window*);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,1);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,1);
free(window->command);
window->Window=NULL;
}
@ -1197,7 +1203,6 @@ log_window *yon_log_window_new(){
window->LogLabel = yon_gtk_builder_get_widget(builder,"LogLabel");
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
window->ScrollToEndCheck = yon_gtk_builder_get_widget(builder,"ScrollToEndCheck");
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window);
gtk_widget_show(window->Window);
return window;
}
@ -1225,16 +1230,28 @@ if (window->Window){
return 0;
}
void on_process_log_view(GtkWidget *);
void on_process_log_view(GtkWidget *){
void on_process_log_view(GtkWidget *,main_window *widgets);
void on_process_log_view(GtkWidget *,main_window *widgets){
log_window *window = yon_log_window_new();
dictionary *dict=NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),dict);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,0);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,0);
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer");
window->command = yon_char_new(short_log_path);
gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window);
}
void on_summary_log_view(GtkWidget *){
void on_summary_log_view(GtkWidget *,main_window *widgets){
log_window *window = yon_log_window_new();
dictionary *dict=NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),dict);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,0);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,0);
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer");
window->command = yon_char_new(full_log_path);
gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window);
@ -2526,7 +2543,7 @@ int main(int argc, char *argv[]){
}
gtk_init(&argc,&argv);
main_window *widgets = NULL;
widgets = yon_main_window_complete((main_window*)widgets);
widgets = yon_main_window_complete();
yon_window_config_setup(GTK_WINDOW(widgets->MainWindow));
yon_window_config_load(config_path);

2
source/ubinstall-gtk.h
Unescape View File

@ -448,7 +448,7 @@ char* yon_debug_output(char *pattern,char*text);
char *yon_save_command_prepare(char *command, char *target);
void yon_interface_update(main_window *widgets);
void on_summary_log_view(GtkWidget *);
void on_summary_log_view(GtkWidget *,main_window *widgets);
void on_near_installation_device_changed(GtkWidget *self, main_window *widgets);
void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle);

5
source/ubl-strings.h
Unescape View File

@ -165,4 +165,7 @@
#define SCROLL_TO_END_LABEL _("Scroll to the end")
#define ADMINISTRATOR_LABEL _("Administrator")
#define DEFAULT_LOCALES_LABEL _("English, U.S.A.; Russian, Russia")
#define DEFAULT_LOCALES_LABEL _("English, U.S.A.; Russian, Russia")
#define READ_INSTALL_LOG_LABEL _("Read installation log")
#define READ_PROGRESS_LOG_LABEL _("Read progress log")

65
ubinstall-gtk.glade
Unescape View File

@ -583,6 +583,7 @@ agreement</property>
<property name="halign">center</property>
<property name="label" translatable="yes">This program will ask you few questions
and help you install UBLinux on your computer</property>
<property name="justify">center</property>
<property name="wrap">True</property>
<attributes>
<attribute name="weight" value="semibold"/>
@ -1588,7 +1589,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="label" translatable="yes">Region:</property>
</object>
</child>
@ -1614,7 +1615,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="RegionCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -1651,7 +1652,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="ZoneCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -1699,7 +1700,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="LanguagesSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="AvailableLanguagesButton" swapped="no"/>
@ -1764,7 +1765,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="MainLanguageSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="LanguagesCombo" swapped="no"/>
@ -1786,7 +1787,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBox" id="LanguagesCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="model">LanguagesFilter</property>
<property name="id-column">2</property>
<signal name="changed" handler="on_toggle_button_switch_on" object="MainLanguageSensitiveCheck" swapped="no"/>
@ -1893,7 +1894,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="KeyboardModelSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="KeyboardModelCombo" swapped="no"/>
@ -1915,7 +1916,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="KeyboardModelCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item id="pc105" translatable="yes">Default (Regular 105-key)</item>
@ -1943,7 +1944,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="OptionsSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="LayoutBindingCombo" swapped="no"/>
@ -1965,7 +1966,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="LayoutBindingCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item id="grp:lalt_lshift_toggle,grp_led:scroll,compose:rwin" translatable="yes">Default (L_Alt + L_Shift)</item>
@ -2025,7 +2026,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="LayoutSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="AddButton" swapped="no"/>
@ -2290,7 +2291,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="UsernameSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="UserNameEntry" swapped="no"/>
@ -2338,7 +2339,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="LoginSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="LoginEntry" swapped="no"/>
@ -2386,7 +2387,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="PasswordSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
@ -2408,7 +2409,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="PasswordCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
@ -2453,7 +2454,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="AutologinSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="AutologinCheck" swapped="no"/>
@ -2497,7 +2498,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="RootPasswordSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
@ -2519,7 +2520,7 @@ and help you install UBLinux on your computer</property>
<object class="GtkComboBoxText" id="AdminPasswordCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">0</property>
<items>
<item translatable="yes">Default</item>
@ -2575,7 +2576,7 @@ and help you install UBLinux on your computer</property>
<child>
<object class="GtkCheckButton" id="HostnameSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
@ -3068,7 +3069,7 @@ or continue working in the UBLinux Live environment.</property>
<child>
<object class="GtkCheckButton" id="CommonFilesystemSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="CommonInstallationFilesystemTypeCombo" swapped="no"/>
@ -3090,7 +3091,7 @@ or continue working in the UBLinux Live environment.</property>
<object class="GtkComboBoxText" id="CommonInstallationFilesystemTypeCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item translatable="yes">ext3</item>
@ -3126,7 +3127,7 @@ or continue working in the UBLinux Live environment.</property>
<child>
<object class="GtkCheckButton" id="CommonSectionSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="CommonInstallationSectionNameEntry" swapped="no"/>
@ -3575,7 +3576,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="NextSizeSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="InstallationNearSizeSpin" swapped="no"/>
@ -3614,7 +3615,7 @@ installed.</property>
<object class="GtkComboBoxText" id="InstallationNearSizeTypeSpin">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item id="M" translatable="yes">Mb</item>
@ -3651,14 +3652,14 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="NextFSTypeSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="NextInstallationFormatCheck" swapped="no"/>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="label" translatable="yes">Choose file system type for the section:</property>
</object>
</child>
@ -3673,7 +3674,7 @@ installed.</property>
<object class="GtkComboBoxText" id="NextInstallationFilesystemTypeCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item id="ext3" translatable="yes">ext3</item>
@ -3724,7 +3725,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="NextLabelSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="NextInstallationSectionNameEntry" swapped="no"/>
@ -4168,7 +4169,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="SameFSTypeSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="SameInstallationFormatCheck" swapped="no"/>
@ -4190,7 +4191,7 @@ installed.</property>
<object class="GtkComboBoxText" id="SameInstallationFilesystemTypeCombo">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="active">1</property>
<items>
<item translatable="yes">ext3</item>
@ -4242,7 +4243,7 @@ installed.</property>
<child>
<object class="GtkCheckButton" id="SameLabelSensitiveCheck">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_widget_set_sensitive_from_toggle_button" object="SameInstallationSectionNameEntry" swapped="no"/>
@ -7242,6 +7243,7 @@ separately into the selected partition.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Read installation log</property>
<property name="image">image16</property>
<style>
<class name="thin"/>
@ -7305,6 +7307,7 @@ separately into the selected partition.</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Read progress log</property>
<property name="image">image15</property>
<style>
<class name="thin"/>

8
ubinstall-gtk.pot
Unescape View File

@ -553,6 +553,14 @@ msgstr ""
msgid "Log exploration"
msgstr ""
#: source/ubl-strings.h:140
msgid "Read installation log"
msgstr ""
#: source/ubl-strings.h:140
msgid "Read progress log"
msgstr ""
msgid "Load global configuration"
msgstr ""

8
ubinstall-gtk_ru.po
Unescape View File

@ -629,6 +629,14 @@ msgstr "Настройки"
msgid "Administrator"
msgstr "Администратор"
#: source/ubl-strings.h:140
msgid "Read installation log"
msgstr "Открыть лог установки"
#: source/ubl-strings.h:140
msgid "Read progress log"
msgstr "Открыть лог прогресса"
msgid "English, U.S.A.; Russian, Russia"
msgstr "Английский, США; Русский, Россия"

Write Preview
Loading…
Cancel
Save