Design changes

pull/63/head
Ivan Yartsev 1 month ago
parent 62637ed0b4
commit 725dc803a5

@ -406,3 +406,7 @@ msgstr ""
#: source/ubl-strings.h:103
msgid "Manual input (for advanced users)"
msgstr ""
#: source/ubl-strings.h:103
msgid "Current quota has no parameters"
msgstr ""

@ -433,3 +433,7 @@ msgstr "Применить изменения лимита операций"
#: source/ubl-strings.h:103
msgid "Manual input (for advanced users)"
msgstr "Ручной ввод (для опытных пользователей)"
#: source/ubl-strings.h:103
msgid "Current quota has no parameters"
msgstr "Для текущей квоты не было задано ни одного параметра"

@ -292,7 +292,7 @@ void on_quotas_save(GtkWidget *self, dictionary *windows){
// main_window *widgets = yon_dictionary_get_data(windows->first->next,main_window*);
GtkTreeIter iter;
if (!strcmp(gtk_entry_get_text(GTK_ENTRY(window->ManualInputEntry)),"")){
yon_ubl_status_box_render(OPERATION_FAILED_EMPTY_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),OPERATION_FAILED_EMPTY_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return;
}
const char *string = gtk_entry_get_text(GTK_ENTRY(window->ManualInputEntry));
@ -673,6 +673,7 @@ void on_add_open(GtkWidget *, main_window *widgets){
window->Window = yon_gtk_builder_get_widget(builder,"QuotasWindow");
window->TitleLabel = yon_gtk_builder_get_widget(builder,"TitleLabel");
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
window->BlockUiBox = yon_gtk_builder_get_widget(builder,"BlockUiBox");
window->TargetTypeCombo = yon_gtk_builder_get_widget(builder,"TargetTypeCombo");
window->AddQuotaTargetBox = yon_gtk_builder_get_widget(builder,"AddQuotaTargetBox");
@ -859,7 +860,7 @@ void on_quotas_edit(GtkWidget *self, dictionary *windows){
main_window *widgets = yon_dictionary_get_data(windows->first->next,main_window*);
GtkTreeIter iter;
if (!strcmp(gtk_entry_get_text(GTK_ENTRY(window->ManualInputEntry)),"")){
yon_ubl_status_box_render(OPERATION_FAILED_EMPTY_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),OPERATION_FAILED_EMPTY_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return;
}
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->MainTree)),&model,&iter)){
@ -931,6 +932,7 @@ void on_edit_open(GtkWidget *, main_window *widgets){
window->Window = yon_gtk_builder_get_widget(builder,"QuotasWindow");
window->TitleLabel = yon_gtk_builder_get_widget(builder,"TitleLabel");
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
window->BlockUiBox = yon_gtk_builder_get_widget(builder,"BlockUiBox");
window->TargetTypeCombo = yon_gtk_builder_get_widget(builder,"TargetTypeCombo");
window->AddQuotaTargetBox = yon_gtk_builder_get_widget(builder,"AddQuotaTargetBox");

@ -129,6 +129,7 @@ typedef struct {
GtkWidget *Window;
GtkWidget *TitleLabel;
GtkWidget *StatusBox;
GtkWidget *BlockUiBox;
GtkWidget *EditQuotaTargetBox;
GtkWidget *AddQuotaTargetBox;

@ -87,7 +87,7 @@
#define VIEW_PROPERTIES_LABEL _("View properties for")
#define ADDING_LABEL _("CPU and RAM quotas - Adding")
#define ADDING_LABEL _("Add")
#define EDITING_LABEL _("CPU and RAM quotas - Editing")
#define QUOTA_OBJ_LABEL _("Quota object:")
#define RAM_LABEL _("RAM limit")

@ -3,40 +3,6 @@
<interface domain="ubl-settings-resourcequota">
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-resourcequota.css -->
<object class="GtkAdjustment" id="adjustment1">
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment5">
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment6">
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">process-stop-symbolic</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">emblem-ok-symbolic</property>
</object>
<object class="GtkWindow" id="QuotasWindow">
<property name="can-focus">False</property>
<property name="valign">start</property>
@ -47,9 +13,32 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox" id="StatusBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
@ -151,7 +140,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
@ -224,8 +213,9 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="width-chars">7</property>
<property name="text" translatable="yes">0</property>
<property name="text" translatable="yes">1</property>
<property name="adjustment">adjustment3</property>
<property name="value">1</property>
</object>
<packing>
<property name="expand">False</property>
@ -311,8 +301,9 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="width-chars">7</property>
<property name="text" translatable="yes">0</property>
<property name="text" translatable="yes">1</property>
<property name="adjustment">adjustment4</property>
<property name="value">1</property>
</object>
<packing>
<property name="expand">False</property>
@ -414,8 +405,9 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="width-chars">7</property>
<property name="text" translatable="yes">0</property>
<property name="text" translatable="yes">1</property>
<property name="adjustment">adjustment5</property>
<property name="value">1</property>
</object>
<packing>
<property name="expand">False</property>
@ -498,8 +490,9 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="width-chars">7</property>
<property name="text" translatable="yes">0</property>
<property name="text" translatable="yes">1</property>
<property name="adjustment">adjustment6</property>
<property name="value">1</property>
</object>
<packing>
<property name="expand">False</property>
@ -849,7 +842,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
<child>
@ -906,6 +899,13 @@
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
@ -941,4 +941,55 @@
<widget name="box1"/>
</widgets>
</object>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">1</property>
<property name="value">1</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="lower">1</property>
<property name="upper">1</property>
<property name="value">1</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="lower">1</property>
<property name="upper">1</property>
<property name="value">1</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
<property name="lower">1</property>
<property name="upper">1</property>
<property name="value">1</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment5">
<property name="lower">1</property>
<property name="upper">1</property>
<property name="value">1</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment6">
<property name="lower">1</property>
<property name="value">1</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">process-stop-symbolic</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">emblem-ok-symbolic</property>
</object>
</interface>

Loading…
Cancel
Save