Merge pull request 'master' (#196) from YanTheKaller/ubinstall-gtk:master into master
Reviewed-on: #196pull/239/head
commit
66f7da30b2
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 720 B |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 935 B |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 4.4 KiB |
|
After Width: | Height: | Size: 998 B |
@ -0,0 +1,9 @@
|
|||||||
|
|
||||||
|
msgid "Universal macOS-style dock-panel"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "System monitor"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Check the internet is alive"
|
||||||
|
msgstr ""
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
# Language translations for ubinstal package.
|
||||||
|
# Copyright (C) 2022, UBTech LLC
|
||||||
|
# This file is distributed under the same license as the ubinstal package.
|
||||||
|
# UBLinux Team <info@ublinux.com>, 2022
|
||||||
|
#
|
||||||
|
#, fuzzy
|
||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"Project-Id-Version: ubinstal 1.0\n"
|
||||||
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
"POT-Creation-Date: 2023-05-22 16:12+0600\n"
|
||||||
|
"PO-Revision-Date: \n"
|
||||||
|
"Last-Translator: \n"
|
||||||
|
"Language-Team: \n"
|
||||||
|
"Language: \n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
|
||||||
|
msgid "Universal macOS-style dock-panel"
|
||||||
|
msgstr "Универсальная панель Dock в стиле macOS"
|
||||||
|
|
||||||
|
msgid "System monitor"
|
||||||
|
msgstr "Системный монитор"
|
||||||
|
|
||||||
|
msgid "Check the internet is alive"
|
||||||
|
msgstr "Проверка наличия интернет-соединения"
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,214 @@
|
|||||||
|
#include "ubinstall-gtk.h"
|
||||||
|
|
||||||
|
void on_srartup_apps_toggled(GtkWidget *, char *path, main_window *widgets){
|
||||||
|
GtkTreeIter iter;
|
||||||
|
int status;
|
||||||
|
gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->StartupAppsList),&iter,path);
|
||||||
|
gtk_tree_model_get(GTK_TREE_MODEL(widgets->StartupAppsList),&iter,0,&status,-1);
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,!status,-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_startup_apps_selection_changed(GtkWidget *,main_window *widgets){
|
||||||
|
GtkTreeIter iter;
|
||||||
|
GtkTreeModel *model;
|
||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupAppsTree)),&model,&iter)){
|
||||||
|
int status;
|
||||||
|
gtk_tree_model_get(model,&iter,4,&status,-1);
|
||||||
|
if (status){
|
||||||
|
gtk_widget_set_sensitive(widgets->StartupAppsEditButton,1);
|
||||||
|
gtk_widget_set_sensitive(widgets->StartupAppsRemoveButton,1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gtk_widget_set_sensitive(widgets->StartupAppsEditButton,0);
|
||||||
|
gtk_widget_set_sensitive(widgets->StartupAppsRemoveButton,0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_startup_apps_remove(GtkWidget *self,main_window *widgets){
|
||||||
|
GtkTreeIter iter;
|
||||||
|
GtkTreeModel *model;
|
||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupAppsTree)),&model,&iter)){
|
||||||
|
char *unit;
|
||||||
|
int deletable;
|
||||||
|
gtk_tree_model_get(model,&iter,2,&unit,4,&deletable,-1);
|
||||||
|
if (!deletable) return;
|
||||||
|
dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
|
||||||
|
data->action_text = SERVICE_REMOVE_CONFIRMATION_LABEL(unit);
|
||||||
|
data->title = SERVICE_REMOVE_TITLE_LABEL;
|
||||||
|
if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){
|
||||||
|
gtk_list_store_remove(widgets->StartupList,&iter);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void yon_startup_apps_setup(main_window *widgets){
|
||||||
|
GtkTreeIter iter;
|
||||||
|
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->StartupAppsList),&iter)){
|
||||||
|
int size;
|
||||||
|
config_str apps = yon_resource_open_file(apps_list_path,&size);
|
||||||
|
for (int i=1;i<size;i++){
|
||||||
|
int parsed_size;
|
||||||
|
config_str parsed = yon_char_parse(apps[i],&parsed_size,";");
|
||||||
|
if (parsed_size&&!yon_char_is_empty(parsed[0])){
|
||||||
|
gtk_list_store_append(widgets->StartupAppsList,&iter);
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(_(parsed[2]),""),-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
char *startup = config(SERVICES_ENABLE_parameter);
|
||||||
|
if (!yon_char_is_empty(startup)){
|
||||||
|
if (!strcmp(startup,"auto")){
|
||||||
|
for_iter(GTK_TREE_MODEL(widgets->StartupAppsList),&iter){
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,-1);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
int parsed_size;
|
||||||
|
config_str parsed = yon_char_parse(startup,&parsed_size,",");
|
||||||
|
for_iter(GTK_TREE_MODEL(widgets->StartupAppsList),&iter){
|
||||||
|
char *target;
|
||||||
|
gtk_tree_model_get(GTK_TREE_MODEL(widgets->StartupAppsList),&iter,2,&target,-1);
|
||||||
|
if (strstr(target,",")){
|
||||||
|
int target_size;
|
||||||
|
config_str target_parsed = yon_char_parse(target,&target_size,",");
|
||||||
|
int found =0;
|
||||||
|
for (int i=0;i<target_size;i++){
|
||||||
|
int pos = yon_char_parsed_check_exist(parsed,parsed_size,target_parsed[i]);
|
||||||
|
if (pos>-1){
|
||||||
|
found++;
|
||||||
|
parsed = yon_char_parsed_rip(parsed,&parsed_size,pos);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (found == target_size){
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,-1);
|
||||||
|
} else {
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,0,-1);
|
||||||
|
}
|
||||||
|
yon_char_parsed_free(target_parsed,target_size);
|
||||||
|
} else {
|
||||||
|
int pos = yon_char_parsed_check_exist(parsed,parsed_size,target);
|
||||||
|
if (pos>-1){
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,-1);
|
||||||
|
parsed = yon_char_parsed_rip(parsed,&parsed_size,pos);
|
||||||
|
} else {
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,0,-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (parsed_size&&parsed){
|
||||||
|
for (int i=0;i<parsed_size;i++){
|
||||||
|
gtk_list_store_append(widgets->StartupAppsList,&iter);
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,2,parsed[i],-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
yon_char_parsed_free(parsed,parsed_size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_startup_app_add_accept(GtkWidget *self, main_window *widgets){
|
||||||
|
startup_service_window *window = g_object_get_data(G_OBJECT(self),"startup_service_window");
|
||||||
|
const char *unit = gtk_entry_get_text(GTK_ENTRY(window->UnitEntry));
|
||||||
|
const char *app = gtk_entry_get_text(GTK_ENTRY(window->ServiceEntry));
|
||||||
|
const char *description = gtk_entry_get_text(GTK_ENTRY(window->DescriptionEntry));
|
||||||
|
if (yon_char_is_empty(app)){
|
||||||
|
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),_EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
|
||||||
|
yon_ubl_status_highlight_incorrect(window->ServiceEntry);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
GtkTreeIter iter;
|
||||||
|
gtk_list_store_append(widgets->StartupAppsList,&iter);
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,unit,2,app,3,description,4,1,-1);
|
||||||
|
on_subwindow_close(self);
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_startup_app_edit_accept(GtkWidget *self, main_window *widgets){
|
||||||
|
GtkTreeIter iter;
|
||||||
|
GtkTreeModel *model;
|
||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupServicesTree)),&model,&iter)){
|
||||||
|
startup_service_window *window = g_object_get_data(G_OBJECT(self),"startup_service_window");
|
||||||
|
const char *unit = gtk_entry_get_text(GTK_ENTRY(window->UnitEntry));
|
||||||
|
const char *app = gtk_entry_get_text(GTK_ENTRY(window->ServiceEntry));
|
||||||
|
const char *description = gtk_entry_get_text(GTK_ENTRY(window->DescriptionEntry));
|
||||||
|
if (yon_char_is_empty(app)){
|
||||||
|
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),_EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
|
||||||
|
yon_ubl_status_highlight_incorrect(window->ServiceEntry);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,1,unit,2,app,3,description,4,1,-1);
|
||||||
|
}
|
||||||
|
on_subwindow_close(self);
|
||||||
|
}
|
||||||
|
|
||||||
|
startup_service_window *yon_startup_app_window_new(){
|
||||||
|
startup_service_window *window = new(startup_service_window);
|
||||||
|
|
||||||
|
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_service);
|
||||||
|
|
||||||
|
window->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
|
||||||
|
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
|
||||||
|
window->AcceptButton = yon_gtk_builder_get_widget(builder,"AcceptButton");
|
||||||
|
window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");
|
||||||
|
window->UnitEntry = yon_gtk_builder_get_widget(builder,"UnitEntry");
|
||||||
|
window->ServiceEntry = yon_gtk_builder_get_widget(builder,"ServiceEntry");
|
||||||
|
window->DescriptionEntry = yon_gtk_builder_get_widget(builder,"DescriptionEntry");
|
||||||
|
window->AppLabel = yon_gtk_builder_get_widget(builder,"AppLabel");
|
||||||
|
window->GroupLabel = yon_gtk_builder_get_widget(builder,"GroupLabel");
|
||||||
|
window->DescriptionLabel = yon_gtk_builder_get_widget(builder,"DescriptionLabel");
|
||||||
|
gtk_label_set_text(GTK_LABEL(window->AppLabel),APP_LABEL);
|
||||||
|
gtk_label_set_text(GTK_LABEL(window->AppLabel),GROUP_LABEL);
|
||||||
|
|
||||||
|
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
|
||||||
|
g_object_set_data(G_OBJECT(window->AcceptButton),"startup_service_window",window);
|
||||||
|
|
||||||
|
return window;
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_startup_app_add(GtkWidget *, main_window *widgets){
|
||||||
|
startup_service_window *window = yon_startup_app_window_new();
|
||||||
|
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),SERVICE_ADD_TITLE_LABEL,icon_path,"app_add_window");
|
||||||
|
g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_startup_app_add_accept),widgets);
|
||||||
|
gtk_widget_show(window->Window);
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_startup_app_edit(GtkWidget *, main_window *widgets){
|
||||||
|
GtkTreeIter iter;
|
||||||
|
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->StartupServicesTree)),NULL,&iter)){
|
||||||
|
char *app, *unit, *description;
|
||||||
|
int status;
|
||||||
|
gtk_tree_model_get(GTK_TREE_MODEL(widgets->StartupAppsList),&iter,1,&unit,2,&app,3,&description,4,&status,-1);
|
||||||
|
if (status){
|
||||||
|
startup_service_window *window = yon_startup_app_window_new();
|
||||||
|
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),SERVICE_EDIT_TITLE_LABEL,icon_path,"app_add_window");
|
||||||
|
g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_startup_app_edit_accept),widgets);
|
||||||
|
gtk_entry_set_text(GTK_ENTRY(window->UnitEntry),unit);
|
||||||
|
gtk_entry_set_text(GTK_ENTRY(window->ServiceEntry),app);
|
||||||
|
gtk_entry_set_text(GTK_ENTRY(window->DescriptionEntry),description);
|
||||||
|
gtk_widget_show(window->Window);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int yon_startup_app_save(main_window *widgets){
|
||||||
|
GtkTreeIter iter;
|
||||||
|
GtkTreeModel *model = GTK_TREE_MODEL(widgets->StartupAppsList);
|
||||||
|
int size = 0;
|
||||||
|
int list_size=0;
|
||||||
|
config_str modules = NULL;
|
||||||
|
for_iter(model,&iter){
|
||||||
|
list_size++;
|
||||||
|
char *target;
|
||||||
|
int status;
|
||||||
|
gtk_tree_model_get(model,&iter,0,&status,2,&target,-1);
|
||||||
|
if (status){
|
||||||
|
yon_char_parsed_add_or_create_if_exists(modules,&size,target);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (size){
|
||||||
|
char *final = yon_char_parsed_to_string(modules,size,",");
|
||||||
|
yon_config_register(AUTOEXEC_parameter,AUTOEXEC_parameter_command,final);
|
||||||
|
yon_char_parsed_free(modules,size);
|
||||||
|
} else {
|
||||||
|
yon_config_remove_by_key(AUTOEXEC_parameter);
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,73 +1,41 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!-- Generated with glade 3.38.2 -->
|
<!-- Generated with glade 3.40.0 -->
|
||||||
<interface domain="ubl-settings-bootloader">
|
<interface domain="ubl-settings-bootloader">
|
||||||
<requires lib="gtk+" version="3.24"/>
|
<requires lib="gtk+" version="3.24"/>
|
||||||
<!-- interface-css-provider-path ubl-settings-bootloader.css -->
|
<!-- interface-css-provider-path ubl-settings-bootloader.css -->
|
||||||
<object class="GtkBox" id="MenuItemBox">
|
<object class="GtkListBoxRow" id="MenuItemRow">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can-focus">False</property>
|
<property name="can-focus">True</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkButton" id="MenuButton">
|
<object class="GtkBox">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can-focus">True</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="receives-default">True</property>
|
<property name="spacing">5</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox">
|
<object class="GtkLabel" id="MenuTextLabel">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can-focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="spacing">5</property>
|
<property name="label" translatable="yes">label</property>
|
||||||
<child>
|
|
||||||
<object class="GtkLabel" id="MenuTextLabel">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can-focus">False</property>
|
|
||||||
<property name="label" translatable="yes">label</property>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="position">0</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkMenuButton" id="NextIconButton">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can-focus">True</property>
|
|
||||||
<property name="focus-on-click">False</property>
|
|
||||||
<property name="receives-default">True</property>
|
|
||||||
<property name="popup">menu1</property>
|
|
||||||
<property name="direction">right</property>
|
|
||||||
<child>
|
|
||||||
<placeholder/>
|
|
||||||
</child>
|
|
||||||
<style>
|
|
||||||
<class name="thin"/>
|
|
||||||
<class name="noborder"/>
|
|
||||||
<class name="nobackground"/>
|
|
||||||
</style>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="pack-type">end</property>
|
|
||||||
<property name="position">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
</object>
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<object class="GtkImage" id="ArrowImage">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.pan-right-symbolic</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">True</property>
|
||||||
|
<property name="position">1</property>
|
||||||
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<style>
|
|
||||||
<class name="noborder"/>
|
|
||||||
<class name="menunoborder"/>
|
|
||||||
</style>
|
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
|
||||||
<property name="expand">True</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="position">0</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
<object class="GtkMenu" id="menu1">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can-focus">False</property>
|
|
||||||
</object>
|
|
||||||
</interface>
|
</interface>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue