diff options
| author | randomguy3 <randomguy3@7c02a99a-9b00-45e3-bf44-6f3dd7fddb64> | 2012-01-08 17:37:03 +0000 |
|---|---|---|
| committer | randomguy3 <randomguy3@7c02a99a-9b00-45e3-bf44-6f3dd7fddb64> | 2012-01-08 17:37:03 +0000 |
| commit | e9b614e436b5720c1b2c51a07c5c063197cbf1e1 (patch) | |
| tree | c941e6ad7e36ea4b155945c3f2e86290d4882997 /src | |
| parent | 04c737bcffd1ed1f16b33c2a4199497c881c8502 (diff) | |
Fix app icon and directory creation on Windows
git-svn-id: https://tikzit.svn.sourceforge.net/svnroot/tikzit/trunk@359 7c02a99a-9b00-45e3-bf44-6f3dd7fddb64
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/common/Shape.m | 3 | ||||
| -rw-r--r-- | src/linux/MainWindow.m | 2 | ||||
| -rw-r--r-- | src/tikzit.rc | 24 |
4 files changed, 33 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 117bedf..d2d558f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -87,6 +87,13 @@ tikzit_SOURCES += \ linux/PreviewWindow.m endif +if WINDOWS +tikzit.res: tikzit.rc + $(AM_V_GEN)windres $^ -O coff -o $@ + +tikzit_LDADD = tikzit.res +endif + common/tikzlexer.m: common/tikzlexer.lm $(AM_V_GEN)$(LEX) -o $@ $^ diff --git a/src/common/Shape.m b/src/common/Shape.m index 8fdfe8b..8714031 100644 --- a/src/common/Shape.m +++ b/src/common/Shape.m @@ -85,7 +85,6 @@ NSDictionary *shapeDictionary = nil; for (NSString *f in files) { if ([f hasSuffix:@".tikz"]) { nm = [f substringToIndex:[f length]-5]; - NSLog(@"found: %@", nm); TikzShape *sh = [[TikzShape alloc] initWithTikzFile: [shapeDir stringByAppendingPathComponent:f]]; @@ -95,8 +94,6 @@ NSDictionary *shapeDictionary = nil; } } } - } else { - NSLog(@"shape directory \"%@\" not found", shapeDir); } } diff --git a/src/linux/MainWindow.m b/src/linux/MainWindow.m index c68c9e8..6ef8837 100644 --- a/src/linux/MainWindow.m +++ b/src/linux/MainWindow.m @@ -567,11 +567,13 @@ static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAc g_object_ref_sink (mainWindow); gtk_window_set_title (mainWindow, "TikZiT"); gtk_window_set_default_size (mainWindow, 700, 400); +#ifndef WINDOWS GdkPixbuf *icon = gdk_pixbuf_new_from_file (TIKZITSHAREDIR "/tikzit48x48.png", NULL); if (icon) { gtk_window_set_icon (mainWindow, icon); g_object_unref (icon); } +#endif GtkBox *mainLayout = GTK_BOX (gtk_vbox_new (FALSE, 0)); gtk_widget_show (GTK_WIDGET (mainLayout)); diff --git a/src/tikzit.rc b/src/tikzit.rc new file mode 100644 index 0000000..072f825 --- /dev/null +++ b/src/tikzit.rc @@ -0,0 +1,24 @@ +1 VERSIONINFO +FILEVERSION 0,7,0,0 +PRODUCTVERSION 0,7,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904E4" + BEGIN + VALUE "FileDescription", "A graph editor for LaTeX" + VALUE "FileVersion", "1.0" + VALUE "InternalName", "tikzit" + VALUE "LegalCopyright", "Aleks Kissinger, Alex Merry, Chris Heunen" + VALUE "OriginalFilename", "tikzit.exe" + VALUE "ProductName", "TikZiT" + VALUE "ProductVersion", "0.7" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1252 + END +END +id ICON "../tikzit.ico" |