mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

Restructured code for layer selector

Browse Source
This commit is contained in:
Mario Hüttel 2019-03-13 20:32:09 +01:00
parent 658e681c38
commit 1e6d0bd1b9
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -20,7 +20,8 @@ aux_source_directory("gds-parser" PARSER_SOURCES)
aux_source_directory("latex-output" LATEX_SOURCES) aux_source_directory("latex-output" LATEX_SOURCES)
aux_source_directory("cairo-output" CAIRO_SOURCES) aux_source_directory("cairo-output" CAIRO_SOURCES)
aux_source_directory("trigonometric" TRIG_SOURCES) aux_source_directory("trigonometric" TRIG_SOURCES)
set(SOURCE "main.c" "layer-selector.c" "layer-selector-dnd.c" "mapping-parser.c" "command-line.c" "main-window.c" "external-renderer.c") aux_source_directory("layer-selector" LAYER_SELECTOR_SOURCES)
set(SOURCE "main.c" "mapping-parser.c" "command-line.c" "main-window.c" "external-renderer.c")
set(SOURCE set(SOURCE
${SOURCE} ${SOURCE}
@ -30,6 +31,7 @@ set(SOURCE
${LATEX_SOURCES} ${LATEX_SOURCES}
${CAIRO_SOURCES} ${CAIRO_SOURCES}
${TRIG_SOURCES} ${TRIG_SOURCES}
${LAYER_SELECTOR_SOURCES}
) )
add_compile_options(-Wall) add_compile_options(-Wall)

2
cairo-output/cairo-output.h
View File

@ -24,7 +24,7 @@
#ifndef __CAIRO_OUTPUT_H__ #ifndef __CAIRO_OUTPUT_H__
#define __CAIRO_OUTPUT_H__ #define __CAIRO_OUTPUT_H__
#include "../layer-selector.h" #include "../layer-selector/layer-selector.h"
#include "../gds-parser/gds-types.h" #include "../gds-parser/gds-types.h"
/** @addtogroup Cairo-Renderer /** @addtogroup Cairo-Renderer

2
layer-selector-dnd.c → layer-selector/layer-selector-dnd.c
View File

@ -223,7 +223,7 @@ void layer_selector_list_box_setup_dnd(GtkListBox *box)
gtk_css_provider_load_from_data (provider, dnd_additional_css, -1, NULL); gtk_css_provider_load_from_data (provider, dnd_additional_css, -1, NULL);
gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (provider), 800); gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (provider), 800);
gtk_drag_dest_set(box, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, entries, 1, GDK_ACTION_MOVE); gtk_drag_dest_set(GTK_WIDGET(box), GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, entries, 1, GDK_ACTION_MOVE);
g_signal_connect(box, "drag-data-received", G_CALLBACK(layer_selector_drag_data_received), NULL); g_signal_connect(box, "drag-data-received", G_CALLBACK(layer_selector_drag_data_received), NULL);
g_signal_connect(box, "drag-motion", G_CALLBACK(layer_selector_drag_motion), NULL); g_signal_connect(box, "drag-motion", G_CALLBACK(layer_selector_drag_motion), NULL);
g_signal_connect(box, "drag-leave", G_CALLBACK(layer_selector_drag_leave), NULL); g_signal_connect(box, "drag-leave", G_CALLBACK(layer_selector_drag_leave), NULL);

0
layer-selector-dnd.h → layer-selector/layer-selector-dnd.h
View File

4
layer-selector.c → layer-selector/layer-selector.c
View File

@ -29,8 +29,8 @@
*/ */
#include "layer-selector.h" #include "layer-selector.h"
#include "gds-parser/gds-parser.h" #include "../gds-parser/gds-parser.h"
#include "widgets/layer-element.h" #include "../widgets/layer-element.h"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

2
layer-selector.h → layer-selector/layer-selector.h
View File

@ -28,7 +28,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib.h> #include <glib.h>
#include "mapping-parser.h" #include "../mapping-parser.h"
/** /**
* @brief Defines how to sort the layer selector list box. * @brief Defines how to sort the layer selector list box.

5
main-window.c
View File

@ -31,7 +31,8 @@
#include <stdio.h> #include <stdio.h>
#include "gds-parser/gds-parser.h" #include "gds-parser/gds-parser.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "layer-selector.h" #include "layer-selector/layer-selector.h"
#include "layer-selector/layer-selector-dnd.h"
#include "tree-renderer/tree-store.h" #include "tree-renderer/tree-store.h"
#include "latex-output/latex-output.h" #include "latex-output/latex-output.h"
#include "widgets/conv-settings-dialog.h" #include "widgets/conv-settings-dialog.h"
@ -40,8 +41,6 @@
#include "version/version.h" #include "version/version.h"
#include "tree-renderer/lib-cell-renderer.h" #include "tree-renderer/lib-cell-renderer.h"
#include "gds-parser/gds-tree-checker.h" #include "gds-parser/gds-tree-checker.h"
#include "layer-selector-dnd.h"
/** /**
* @brief User data supplied to callback function of the open button * @brief User data supplied to callback function of the open button
*/ */