From a50f5bc1b5e4893ffefcc0ff38ca03851e106e0a Mon Sep 17 00:00:00 2001 From: bamse16 Date: Mon, 27 Apr 2009 17:47:44 +0000 Subject: Added fix for issue #239 to release branch Added cleaned up html to release branch --- Resources/sequel-pro-print-template.html | 10 +--------- Source/SPQueryConsole.m | 8 ++++---- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Resources/sequel-pro-print-template.html b/Resources/sequel-pro-print-template.html index b0eb0960..da5d6228 100644 --- a/Resources/sequel-pro-print-template.html +++ b/Resources/sequel-pro-print-template.html @@ -7,12 +7,6 @@ html { font-size:82%; } -input, select, textarea { - font-size:1em; -} -div.item label { - white-space:nowrap; -} .nowrap { white-space:nowrap; } @@ -24,9 +18,6 @@ body, table, th, td { background-color:#FFFFFF; color:#000000; } -img { - border:0 none; -} table, th, td { border:0.1em solid #000000; } @@ -40,6 +31,7 @@ table { th, td { padding:0.2em; } + th { background-color:#E5E5E5; font-weight:bold; diff --git a/Source/SPQueryConsole.m b/Source/SPQueryConsole.m index 63fbee18..6e65b3a2 100644 --- a/Source/SPQueryConsole.m +++ b/Source/SPQueryConsole.m @@ -27,7 +27,7 @@ #define MESSAGE_TIME_STAMP_FORMAT @"%H:%M:%S" #define DEFAULT_CONSOLE_LOG_FILENAME @"untitled" -#define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @"log" +#define DEFAULT_CONSOLE_LOG_FILE_EXTENSION @"sql" #define CONSOLE_WINDOW_AUTO_SAVE_NAME @"QueryConsole" @@ -454,7 +454,7 @@ static SPQueryConsole *sharedQueryConsole = nil; */ - (void)_addMessageToConsole:(NSString *)message isError:(BOOL)error { - SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage:[[message stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] stringByAppendingString:@";"] date:[NSDate date]]; + SPConsoleMessage *consoleMessage = [SPConsoleMessage consoleMessageWithMessage:[[[message stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] stringByReplacingOccurrencesOfString:@"\n" withString:@" "] stringByAppendingString:@";"] date:[NSDate date]]; [consoleMessage setIsError:error]; @@ -479,7 +479,7 @@ static SPQueryConsole *sharedQueryConsole = nil; * and whether it should be hidden if the SELECT/SHOW toggle is off. */ - (BOOL)_messageMatchesCurrentFilters:(NSString *)message -{ +{ BOOL messageMatchesCurrentFilters = YES; // Check whether to hide the message based on the current filter text, if any @@ -492,7 +492,7 @@ static SPQueryConsole *sharedQueryConsole = nil; // If hiding SELECTs and SHOWs is toggled to on, check whether the message is a SELECT or SHOW if (messageMatchesCurrentFilters && showSelectStatementsAreDisabled - && ([message hasPrefix:@"SELECT"] || [message hasPrefix:@"SHOW"])) + && ([[message uppercaseString] hasPrefix:@"SELECT"] || [[message uppercaseString] hasPrefix:@"SHOW"])) { messageMatchesCurrentFilters = NO; } -- cgit v1.2.3