HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to confirm before close

Browse Source
This commit is contained in:
Edouard Dupin 2011-07-21 18:03:41 +02:00
parent 654b5b77f4
commit a74b26218f
7 changed files with 89 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/GuiTools/MainWindows/MainWindows.cpp
View File

@ -48,7 +48,7 @@ MainWindows::MainWindows(void) : MsgBroadcast("Main Windows", EDN_CAT_GUI)
gtk_window_set_default_size(GTK_WINDOW(m_mainWindow), 800, 600);
// enable the close signal of the windows
g_signal_connect(G_OBJECT(m_mainWindow), "destroy", G_CALLBACK(gtk_main_quit), NULL);
//g_signal_connect(G_OBJECT(m_mainWindow), "destroy", G_CALLBACK(OnQuit), this);
// Create a vertical box for stacking the menu and editor widgets in.
GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
@ -126,7 +126,11 @@ void MainWindows::OnMessage(int32_t id, int32_t dataID)
}
}
void MainWindows::OnQuit(GtkWidget *widget, gpointer data)
{
EDN_INFO("quit requested");
gtk_main_quit();
}
#if 0

1
Sources/GuiTools/MainWindows/MainWindows.h
View File

@ -50,6 +50,7 @@ class MainWindows: public Singleton<MainWindows>, public MsgBroadcast
public:
GtkWidget * GetWidget(void) { return m_mainWindow;};
void OnMessage(int32_t id, int32_t dataID);
static void OnQuit(GtkWidget *widget, gpointer data);
private:
void SetTitle(Edn::String &fileName, bool isModify);

2
Sources/GuiTools/Search/Search.cpp
View File

@ -152,7 +152,7 @@ void Search::Display(void)
m_BtReplaceAndNext = gtk_button_new_with_label("Replace & Find");
gtk_container_add(GTK_CONTAINER (hbox), m_BtReplaceAndNext);
// Exit
m_BtQuit = gtk_button_new_with_label("Quit");
m_BtQuit = gtk_button_new_with_label("Close");
gtk_container_add(GTK_CONTAINER (hbox), m_BtQuit);
// Connect signals :

44
data/lang_Makefile.xml
View File

@ -9,53 +9,9 @@
<end>\n</end>
<EscapeChar>\</EscapeChar>
</rule>
<rule name="Assignement">
<color>preprocesseur</color>
<start>( *| [ \t]*)[A-Za-z0-9_+][^ \t]*[ \t]*(\+|:)?=</start>
<end>\n</end>
<EscapeChar>\</EscapeChar>
</rule>
Dependency Line
^( *| [ \t]*)(.DEFAULT|.DELETE_ON_ERROR|.EXPORT_ALL_VARIABLES.IGNORE|.INTERMEDIATE|.PHONY|.POSIX|.PRECIOUS|.SECONDARY|.SILENT|.SUFFIXES)*(([A-Za-z0-9./$(){} _@^<*?%+-]*(\\\n)){,8}[A-Za-z0-9./$(){} _@^<*?%+-]*)::?
</pass1>
<pass2> <!-- Parse on display data ==> nor regenerate every display but every time modification apear -->
</pass2>
</EdnLang>
<!--
Parsing : to add :
$ ==> End of line
^ ==> ???
P1 Comment
#
$
P1 Assignement
^( *| [ \t]*)[A-Za-z0-9_+][^ \t]*[ \t]*(\+|:)?=
$
P1 Dependency Line
^( *| [ \t]*)(.DEFAULT|.DELETE_ON_ERROR|.EXPORT_ALL_VARIABLES.IGNORE|.INTERMEDIATE|.PHONY|.POSIX|.PRECIOUS|.SECONDARY|.SILENT|.SUFFIXES)*(([A-Za-z0-9./$(){} _@^<*?%+-]*(\\\n)){,8}[A-Za-z0-9./$(){} _@^<*?%+-]*)::?
$|;
P1 Macro
\$([A-Za-z0-9_]|\([^)]*\)|\{[^}]*})
P1 Internal Macro
\$([<@*?%]|\$@)
P1 Include
^( *| [ \t]*)include[ \t]
P1 Exports
^( *| [ \t]*)<export|unexport>[ \t]
P2 Conditionals
^( *| [ \t]*)<ifeq|ifneq>[ \t]
P2 Conditionals ifdefs
^( *| [ \t]*)<ifdef|ifndef>[ \t]
P2 Conditional Ends
^( *| [ \t]*)<else|endif>
P2 vpath
^( *| [ \t]*)<vpath>[ \t]
P2 define
^( *| [ \t]*)<define>[ \t]
P2 define Ends
^( *| [ \t]*)<endef>
-->

2
data/lang_c.xml
View File

@ -103,7 +103,7 @@
</rule>
<rule name="BIG LETTER">
<color>macro</color>
<start>\@[A-Z_]{4,500}\@</start>
<start>\@[A-Z_][A-Z_0-9]{3,500}\@</start>
</rule>
<rule name="Function name">
<color>functionName</color>

48
data/lang_xml.xml
View File

@ -13,51 +13,3 @@
</pass2>
</EdnLang>
<!--
Parsing : to add :
$ ==> End of line
^ ==> ???
P1 Comment
\< !--
--\ >
P1 ignored section
\<!\[\s*IGNORE\s*\[
\]\]\>
P1 declaration
\<\?(?ixml)
\?\>
P1 doctype
(\<!(?idoctype))\s+(\<?(?!(?ixml))[\l_][\w:-]*\>?)
\>
error : \]
p1 processing instruction
\<\?\S+
\?\>
P1 cdata
\<!\[(?icdata)\[
\]\]\>
P1 element declaration
\<!ELEMENT
\>
P1 entity declaration
\<!ENTITY
\>
p1 notation
\<!NOTATION
\>
P1 attribute declaration
\<!ATTLIST
\>
P1 element
(\</?)((?!(?ixml))[\l_][\w:-]*)
/?\>
P1 entity
&((amp|lt|gt|quot|apos)|#x[\da-fA-F]*|[\l_]\w*);
P1 marked section
\<!\[\s*(?:INCLUDE|(%(?!(?ixml))[\l_][\w:-]*;))\s*\[|\]\]\>
P2 internal subset delims
[\[\]>]
-->

80
data/parsingRegExp.txt Normal file
View File

@ -0,0 +1,80 @@
Makefile :
$ ==> End of line
^ ==> ???
P1 Comment
#
$
P1 Assignement
^( *| [ \t]*)[A-Za-z0-9_+][^ \t]*[ \t]*(\+|:)?=
$
P1 Dependency Line
^( *| [ \t]*)(.DEFAULT|.DELETE_ON_ERROR|.EXPORT_ALL_VARIABLES.IGNORE|.INTERMEDIATE|.PHONY|.POSIX|.PRECIOUS|.SECONDARY|.SILENT|.SUFFIXES)*(([A-Za-z0-9./$(){} _@^<*?%+-]*(\\\n)){,8}[A-Za-z0-9./$(){} _@^<*?%+-]*)::?
$|;
P1 Macro
\$([A-Za-z0-9_]|\([^)]*\)|\{[^}]*})
P1 Internal Macro
\$([<@*?%]|\$@)
P1 Include
^( *| [ \t]*)include[ \t]
P1 Exports
^( *| [ \t]*)<export|unexport>[ \t]
P2 Conditionals
^( *| [ \t]*)<ifeq|ifneq>[ \t]
P2 Conditionals ifdefs
^( *| [ \t]*)<ifdef|ifndef>[ \t]
P2 Conditional Ends
^( *| [ \t]*)<else|endif>
P2 vpath
^( *| [ \t]*)<vpath>[ \t]
P2 define
^( *| [ \t]*)<define>[ \t]
P2 define Ends
^( *| [ \t]*)<endef>
XML :
$ ==> End of line
^ ==> ???
P1 Comment
\< !--
--\ >
P1 ignored section
\<!\[\s*IGNORE\s*\[
\]\]\>
P1 declaration
\<\?(?ixml)
\?\>
P1 doctype
(\<!(?idoctype))\s+(\<?(?!(?ixml))[\l_][\w:-]*\>?)
\>
error : \]
p1 processing instruction
\<\?\S+
\?\>
P1 cdata
\<!\[(?icdata)\[
\]\]\>
P1 element declaration
\<!ELEMENT
\>
P1 entity declaration
\<!ENTITY
\>
p1 notation
\<!NOTATION
\>
P1 attribute declaration
\<!ATTLIST
\>
P1 element
(\</?)((?!(?ixml))[\l_][\w:-]*)
/?\>
P1 entity
&((amp|lt|gt|quot|apos)|#x[\da-fA-F]*|[\l_]\w*);
P1 marked section
\<!\[\s*(?:INCLUDE|(%(?!(?ixml))[\l_][\w:-]*;))\s*\[|\]\]\>
P2 internal subset delims
[\[\]>]