summaryrefslogtreecommitdiff
path: root/tikzit/src/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'tikzit/src/gtk')
-rw-r--r--tikzit/src/gtk/Application.m2
-rw-r--r--tikzit/src/gtk/CairoRenderContext.m2
-rw-r--r--tikzit/src/gtk/Configuration.m8
-rw-r--r--tikzit/src/gtk/EdgeStylesPalette.m1
-rw-r--r--tikzit/src/gtk/Menu.m7
-rw-r--r--tikzit/src/gtk/NodeStylesPalette.m1
-rw-r--r--tikzit/src/gtk/PreambleEditor.m1
-rw-r--r--tikzit/src/gtk/PreviewRenderer.m21
-rw-r--r--tikzit/src/gtk/PreviewWindow.m1
-rw-r--r--tikzit/src/gtk/SettingsDialog.m1
-rw-r--r--tikzit/src/gtk/TikzDocument.h4
-rw-r--r--tikzit/src/gtk/TikzDocument.m6
-rw-r--r--tikzit/src/gtk/Window.h6
-rw-r--r--tikzit/src/gtk/Window.m10
-rw-r--r--tikzit/src/gtk/main.m1
15 files changed, 34 insertions, 38 deletions
diff --git a/tikzit/src/gtk/Application.m b/tikzit/src/gtk/Application.m
index 2720bb6..89fb7fd 100644
--- a/tikzit/src/gtk/Application.m
+++ b/tikzit/src/gtk/Application.m
@@ -77,7 +77,7 @@ Application* app = nil;
if (app != nil) {
[self release];
self = app;
- return app;
+ return self;
}
self = [super init];
diff --git a/tikzit/src/gtk/CairoRenderContext.m b/tikzit/src/gtk/CairoRenderContext.m
index bed06a6..77e10b5 100644
--- a/tikzit/src/gtk/CairoRenderContext.m
+++ b/tikzit/src/gtk/CairoRenderContext.m
@@ -26,7 +26,6 @@
- (id) init {
[self release];
- self = nil;
return nil;
}
@@ -91,7 +90,6 @@
- (id) init {
[self release];
- self = nil;
return nil;
}
diff --git a/tikzit/src/gtk/Configuration.m b/tikzit/src/gtk/Configuration.m
index 7a0e65f..6ac08e8 100644
--- a/tikzit/src/gtk/Configuration.m
+++ b/tikzit/src/gtk/Configuration.m
@@ -268,7 +268,7 @@
gsize length;
gchar **list = g_key_file_get_string_list (file, [group UTF8String], [key UTF8String], &length, NULL);
if (list) {
- NSMutableArray *result = [NSMutableArray new];
+ NSMutableArray *result = [NSMutableArray arrayWithCapacity:length];
for (int i = 0; i < length; ++i) {
[result addObject:[NSString stringWithUTF8String:list[i]]];
}
@@ -288,7 +288,7 @@
gsize length;
gboolean *list = g_key_file_get_boolean_list (file, [group UTF8String], [key UTF8String], &length, NULL);
if (list) {
- NSMutableArray *result = [NSMutableArray new];
+ NSMutableArray *result = [NSMutableArray arrayWithCapacity:length];
for (int i = 0; i < length; ++i) {
[result addObject:[NSNumber numberWithBool:list[i]]];
}
@@ -308,7 +308,7 @@
gsize length;
gint *list = g_key_file_get_integer_list (file, [group UTF8String], [key UTF8String], &length, NULL);
if (list) {
- NSMutableArray *result = [NSMutableArray new];
+ NSMutableArray *result = [NSMutableArray arrayWithCapacity:length];
for (int i = 0; i < length; ++i) {
[result addObject:[NSNumber numberWithInt:list[i]]];
}
@@ -328,7 +328,7 @@
gsize length;
double *list = g_key_file_get_double_list (file, [group UTF8String], [key UTF8String], &length, NULL);
if (list) {
- NSMutableArray *result = [NSMutableArray new];
+ NSMutableArray *result = [NSMutableArray arrayWithCapacity:length];
for (int i = 0; i < length; ++i) {
[result addObject:[NSNumber numberWithDouble:list[i]]];
}
diff --git a/tikzit/src/gtk/EdgeStylesPalette.m b/tikzit/src/gtk/EdgeStylesPalette.m
index 066b38c..33264cf 100644
--- a/tikzit/src/gtk/EdgeStylesPalette.m
+++ b/tikzit/src/gtk/EdgeStylesPalette.m
@@ -52,7 +52,6 @@ static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palett
- (id) init {
[self release];
- self = nil;
return nil;
}
diff --git a/tikzit/src/gtk/Menu.m b/tikzit/src/gtk/Menu.m
index 83bb2b3..677b48f 100644
--- a/tikzit/src/gtk/Menu.m
+++ b/tikzit/src/gtk/Menu.m
@@ -234,19 +234,19 @@ static void redo_cb (GtkAction *action, Window *window) {
static void cut_cb (GtkAction *action, Window *window) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- [window cut];
+ [window selectionCutToClipboard];
[pool drain];
}
static void copy_cb (GtkAction *action, Window *window) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- [window copy];
+ [window selectionCopyToClipboard];
[pool drain];
}
static void paste_cb (GtkAction *action, Window *window) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- [window paste];
+ [window pasteFromClipboard];
[pool drain];
}
@@ -574,7 +574,6 @@ static void tool_cb (GtkAction *action, id<Tool> tool) {
- (id) init {
[self release];
- self = nil;
return nil;
}
diff --git a/tikzit/src/gtk/NodeStylesPalette.m b/tikzit/src/gtk/NodeStylesPalette.m
index a3c69f7..e28edbb 100644
--- a/tikzit/src/gtk/NodeStylesPalette.m
+++ b/tikzit/src/gtk/NodeStylesPalette.m
@@ -52,7 +52,6 @@ static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palett
- (id) init {
[self release];
- self = nil;
return nil;
}
diff --git a/tikzit/src/gtk/PreambleEditor.m b/tikzit/src/gtk/PreambleEditor.m
index b4eb9c7..d1f72ee 100644
--- a/tikzit/src/gtk/PreambleEditor.m
+++ b/tikzit/src/gtk/PreambleEditor.m
@@ -72,7 +72,6 @@ static void preamble_selection_changed_cb (GtkTreeSelection *treeselection,
- (id) init {
[self release];
- self = nil;
return nil;
}
diff --git a/tikzit/src/gtk/PreviewRenderer.m b/tikzit/src/gtk/PreviewRenderer.m
index 43fbe98..26293b5 100644
--- a/tikzit/src/gtk/PreviewRenderer.m
+++ b/tikzit/src/gtk/PreviewRenderer.m
@@ -28,7 +28,6 @@
- (id) init {
[self release];
- self = nil;
return nil;
}
@@ -140,27 +139,30 @@
} NS_HANDLER {
NSLog(@"Failed to run '%@'; error was: %@", path, [localException reason]);
(void)localException;
- NSString *desc = [NSString stringWithFormat:@"Failed to run '%@'", path];
- NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2];
- [errorDetail setValue:desc forKey:NSLocalizedDescriptionKey];
- *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_IO userInfo:errorDetail];
+ if (error) {
+ NSString *desc = [NSString stringWithFormat:@"Failed to run '%@'", path];
+ NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2];
+ [errorDetail setValue:desc forKey:NSLocalizedDescriptionKey];
+ *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_IO userInfo:errorDetail];
+ }
// remove all temporary files
[[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL];
+ [latexTask release];
return NO;
} NS_ENDHANDLER
- NSData *data = [latexOut readDataToEndOfFile];
- NSString *str = [[NSString alloc] initWithData:data
- encoding:NSUTF8StringEncoding];
-
if ([latexTask terminationStatus] != 0) {
if (error) {
+ NSData *data = [latexOut readDataToEndOfFile];
+ NSString *str = [[NSString alloc] initWithData:data
+ encoding:NSUTF8StringEncoding];
NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2];
[errorDetail setValue:@"Generating a PDF file with pdflatex failed" forKey:NSLocalizedDescriptionKey];
[errorDetail setValue:str forKey:TZToolOutputErrorKey];
*error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_TOOL_FAILED userInfo:errorDetail];
+ [str release];
}
} else {
// load pdf document
@@ -189,6 +191,7 @@
// remove all temporary files
[[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL];
+ [latexTask release];
return success;
}
diff --git a/tikzit/src/gtk/PreviewWindow.m b/tikzit/src/gtk/PreviewWindow.m
index c5f138a..cb61ee3 100644
--- a/tikzit/src/gtk/PreviewWindow.m
+++ b/tikzit/src/gtk/PreviewWindow.m
@@ -35,7 +35,6 @@
- (id) init {
[self release];
- self = nil;
return nil;
}
diff --git a/tikzit/src/gtk/SettingsDialog.m b/tikzit/src/gtk/SettingsDialog.m
index e3d8e6b..2844e81 100644
--- a/tikzit/src/gtk/SettingsDialog.m
+++ b/tikzit/src/gtk/SettingsDialog.m
@@ -45,7 +45,6 @@ static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog)
- (id) init {
[self release];
- self = nil;
return nil;
}
diff --git a/tikzit/src/gtk/TikzDocument.h b/tikzit/src/gtk/TikzDocument.h
index 2b55f05..5d15d13 100644
--- a/tikzit/src/gtk/TikzDocument.h
+++ b/tikzit/src/gtk/TikzDocument.h
@@ -72,8 +72,8 @@
- (BOOL) updateTikz:(NSString*)t error:(NSError**)error;
-- (Graph*) cutSelection;
-- (Graph*) copySelection;
+- (Graph*) selectionCut;
+- (Graph*) selectionCopy;
- (void) paste:(Graph*)graph;
- (void) pasteFromTikz:(NSString*)tikz;
diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m
index 86b8afb..6e013b1 100644
--- a/tikzit/src/gtk/TikzDocument.m
+++ b/tikzit/src/gtk/TikzDocument.m
@@ -276,15 +276,15 @@
return NO;
}
-- (Graph*) cutSelection {
- Graph *selection = [self copySelection];
+- (Graph*) selectionCut {
+ Graph *selection = [self selectionCopy];
[self startUndoGroup];
[self removeSelected];
[self nameAndEndUndoGroup:@"Cut"];
return selection;
}
-- (Graph*) copySelection {
+- (Graph*) selectionCopy {
return [[graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]] autorelease];
}
diff --git a/tikzit/src/gtk/Window.h b/tikzit/src/gtk/Window.h
index 42e3588..62af643 100644
--- a/tikzit/src/gtk/Window.h
+++ b/tikzit/src/gtk/Window.h
@@ -114,15 +114,15 @@
/**
* Cut the current selection to the clipboard.
*/
-- (void) cut;
+- (void) selectionCutToClipboard;
/**
* Copy the current selection to the clipboard.
*/
-- (void) copy;
+- (void) selectionCopyToClipboard;
/**
* Paste from the clipboard to the appropriate place.
*/
-- (void) paste;
+- (void) pasteFromClipboard;
/**
* The GTK+ window that this class manages.
diff --git a/tikzit/src/gtk/Window.m b/tikzit/src/gtk/Window.m
index d6d7adb..dd9ee3c 100644
--- a/tikzit/src/gtk/Window.m
+++ b/tikzit/src/gtk/Window.m
@@ -354,19 +354,19 @@ static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAc
}
}
-- (void) cut {
+- (void) selectionCutToClipboard {
if ([[[document pickSupport] selectedNodes] count] > 0) {
- [self _placeGraphOnClipboard:[document cutSelection]];
+ [self _placeGraphOnClipboard:[document selectionCut]];
}
}
-- (void) copy {
+- (void) selectionCopyToClipboard {
if ([[[document pickSupport] selectedNodes] count] > 0) {
- [self _placeGraphOnClipboard:[document copySelection]];
+ [self _placeGraphOnClipboard:[document selectionCopy]];
}
}
-- (void) paste {
+- (void) pasteFromClipboard {
gtk_clipboard_request_contents (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
tikzit_picture_atom,
clipboard_paste_contents,
diff --git a/tikzit/src/gtk/main.m b/tikzit/src/gtk/main.m
index f9b72c8..f56a7b1 100644
--- a/tikzit/src/gtk/main.m
+++ b/tikzit/src/gtk/main.m
@@ -102,6 +102,7 @@ int main (int argc, char *argv[]) {
gtk_main ();
[app saveConfiguration];
+ [app release];
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 01:49:08 +0000