Добавил окно редактирования

pull/2/head
Igor Belitskiy 2 years ago
parent c05b697a58
commit abad7703c8

@ -42,6 +42,8 @@ set(SOURCE_FILES
view/filters.h
view/view_add.c
view/view_add.h
view/view_edit.c
view/view_edit.h
view/ubl-strings.h
view/ubl-utils.h
view/ubl-utils.c

@ -121,6 +121,7 @@ main_window *setup_window(){
widgets->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
widgets->btnEdit = yon_gtk_builder_get_widget(builder,"btnEdit");
widgets->btnAdd = yon_gtk_builder_get_widget(builder,"btnAdd");
widgets->btnInfo = yon_gtk_builder_get_widget(builder,"btnInfo");
widgets->HatLabel = yon_gtk_builder_get_widget(builder,"headerTopic");
widgets->PlugBox = yon_gtk_builder_get_widget(builder,"plugBox");
@ -155,11 +156,15 @@ main_window *setup_window(){
return widgets;
}
void info_show(GtkWidget *self) {
}
void event_all(main_window *widgets) {
g_signal_connect(G_OBJECT(widgets->btnShowFilters),"clicked",G_CALLBACK(filters_show),NULL);
g_signal_connect(G_OBJECT(widgets->btnAdd),"clicked",G_CALLBACK(add_show),NULL);
g_signal_connect(G_OBJECT(widgets->btnEdit),"clicked",G_CALLBACK(edit_show),NULL);
g_signal_connect(G_OBJECT(widgets->btnInfo),"clicked",G_CALLBACK(info_show),NULL);
}
void main_event(main_window *widgets) {
@ -253,6 +258,7 @@ int main(int argc, char *argv[]){
main_window *widgets = setup_window();
filters_window *widget_filters = filters_setup_window(glade_path);
add_window *add_widgets = add_setup_window(glade_path);
edit_window *edit_widgets = edit_setup_window(glade_path);
event_all(widgets);
main_event(widgets);
yon_ubl_header_setup(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);

@ -12,6 +12,7 @@
#include "ubl-cmake.h"
#include "view_add.h"
#include "filters.h"
#include "view_edit.h"
@ -56,6 +57,7 @@ typedef struct {
GtkWidget *Window;
GtkWidget *btnShowFilters;
GtkWidget *btnEdit;
GtkWidget *btnInfo;
GtkWidget *btnAdd;
GtkWidget *HatLabel;
GtkWidget *PlugBox;
@ -103,4 +105,5 @@ main_window *setup_window();
void config_init();
void event_all();
void main_event(main_window *widgets);
void event_all(main_window *widgets);
void event_all(main_window *widgets);
void info_show(GtkWidget *self);

@ -5,12 +5,14 @@ add_window *add_widgets;
add_window *add_setup_window(char* glade_path){
add_widgets = malloc(sizeof(add_window));
GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
add_widgets->Window = yon_gtk_builder_get_widget(builder,"wndQuotasAddingProject");
add_widgets->Window = yon_gtk_builder_get_widget(builder,"wndQuotasAdding");
add_widgets->btnSaveAddSave = yon_gtk_builder_get_widget(builder,"btnSaveAddSave");
add_widgets->btnAddCancel = yon_gtk_builder_get_widget(builder,"btnAddCancel");
return add_widgets;
}
void add_event(add_window *widgets) {
g_signal_connect(G_OBJECT(widgets->btnFiltersCancel),"clicked",G_CALLBACK(add_on_hide_subwindow),NULL);
g_signal_connect(G_OBJECT(widgets->btnSaveAddSave),"clicked",G_CALLBACK(add_on_hide_subwindow),NULL);
}
void add_localization(add_window *widgets) {

@ -15,16 +15,8 @@
// Переменные
typedef struct {
GtkWidget* Window;
GtkWidget* btnFiltersSave;
GtkWidget* btnFiltersCancel;
GtkWidget* chbFilterTypeQouota;
GtkWidget* chbCPULimit;
GtkWidget* chbIOLimitRead;
GtkWidget* chbIOLimitWrite;
GtkWidget* chbSwapFileLimit;
GtkWidget* chbHardLimit;
GtkWidget* chbSoftLimit;
GtkWidget* chbQuotaVolume;
GtkWidget* btnSaveAddSave;
GtkWidget* btnAddCancel;
} add_window;
// Функции

@ -0,0 +1,32 @@
#include "view_edit.h"
edit_window *edit_widgets;
edit_window *edit_setup_window(char* glade_path){
edit_widgets = malloc(sizeof(edit_window));
GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
edit_widgets->Window = yon_gtk_builder_get_widget(builder,"wndQuotasEdit");
edit_widgets->btnEditCancel = yon_gtk_builder_get_widget(builder,"btnEditCancel");
edit_widgets->btnSaveEditSave = yon_gtk_builder_get_widget(builder,"btnSaveEditSave");
return edit_widgets;
}
void edit_event(edit_window *widgets) {
g_signal_connect(G_OBJECT(widgets->btnEditCancel),"clicked",G_CALLBACK(edit_on_hide_subwindow),NULL);
}
void edit_localization(edit_window *widgets) {
}
void edit_on_hide_subwindow(GtkWidget *self) {
gtk_widget_destroy(gtk_widget_get_toplevel(self));
}
edit_window *get_widget_edit() {
return edit_widgets;
}
void edit_show(GtkWidget *self) {
gtk_widget_show_all(edit_widgets->Window);
}

@ -0,0 +1,29 @@
#ifndef VIEW_EDIT_H
#define VIEW_EDIT_H
#include <gtk/gtk.h>
#include <gtk/gtkx.h>
#include "ubl-utils.h"
#include "ubl-strings.h"
#include <locale.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <libintl.h>
#include <getopt.h>
#include <libintl.h>
// Переменные
typedef struct {
GtkWidget* Window;
GtkWidget* btnSaveEditSave;
GtkWidget* btnEditCancel;
} edit_window;
// Функции
edit_window *edit_setup_window(char* glade_path);
void edit_event(edit_window *widgets);
void edit_localization(edit_window *widgets);
void edit_on_hide_subwindow(GtkWidget *self);
edit_window *get_widget_edit();
void edit_show(GtkWidget *self);
#endif

@ -970,7 +970,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkButton">
<object class="GtkButton" id="btnInfo">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
@ -1811,7 +1811,7 @@ translated and supported by community.</property>
</object>
</child>
</object>
<object class="GtkWindow" id="wndQuotasAddingProject">
<object class="GtkWindow" id="wndQuotasAdding">
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="resizable">False</property>
@ -2633,7 +2633,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnCancel1">
<object class="GtkButton" id="btnAddCancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -2654,7 +2654,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnSaveEditSave1">
<object class="GtkButton" id="btnSaveAddSave">
<property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
@ -2710,7 +2710,7 @@ translated and supported by community.</property>
</object>
</child>
</object>
<object class="GtkWindow" id="wndQuotasEditProject">
<object class="GtkWindow" id="wndQuotasEdit">
<property name="can-focus">False</property>
<property name="valign">start</property>
<property name="resizable">False</property>
@ -3533,7 +3533,7 @@ translated and supported by community.</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnCancel">
<object class="GtkButton" id="btnEditCancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>

Loading…
Cancel
Save