aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2013-04-01 00:25:00 +0000
committerrowanbeentje <rowan@beent.je>2013-04-01 00:25:00 +0000
commit6820099de060cbede59f43867a62be5eb424ae4c (patch)
tree7b192a546f1dafc5f5f3ad1e91e1a870085125c4
parentcca030a98637bec8e8a731efb7ad15b3f458b115 (diff)
downloadsequelpro-6820099de060cbede59f43867a62be5eb424ae4c.tar.gz
sequelpro-6820099de060cbede59f43867a62be5eb424ae4c.tar.bz2
sequelpro-6820099de060cbede59f43867a62be5eb424ae4c.zip
- Alter the SPComboPopupButton to ignore clicks started in the left-hand part of the button but ended in the right-hand part of the button
- Change the button to use "Run All" instead of "Run All Queries" to avoid localisation issues
-rw-r--r--Resources/English.lproj/Localizable.stringsbin242972 -> 242950 bytes
-rw-r--r--Source/SPComboPopupButton.m2
-rw-r--r--Source/SPCustomQuery.m7
3 files changed, 4 insertions, 5 deletions
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 11f7fa38..6edb7d1f 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ
diff --git a/Source/SPComboPopupButton.m b/Source/SPComboPopupButton.m
index 76280dac..9ee71084 100644
--- a/Source/SPComboPopupButton.m
+++ b/Source/SPComboPopupButton.m
@@ -283,7 +283,7 @@
// Custom tracking to be performed - indent the vertical button area slightly
- activeRect = NSMakeRect(cellFrame.origin.x, cellFrame.origin.y + heightIndent, cellFrame.size.width, cellFrame.size.height - fabsf(2 * heightIndent));
+ activeRect = NSMakeRect(cellFrame.origin.x, cellFrame.origin.y + heightIndent, cellFrame.size.width - [(SPComboPopupButton *)controlView lineOffset] + 1, cellFrame.size.height - fabsf(2 * heightIndent));
// Continue tracking the mouse while it's down, updating the state as it enters and leaves the cell,
// until it is released; if still within the cell, perform a click.
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index 26f66831..083c676e 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -1384,7 +1384,6 @@
*/
- (void)updateQueryInteractionInterface
{
- NSString *runAllTitle = NSLocalizedString(@"Run All Queries", @"Run All button and menu item title");
// By default, the interface uses Run Query/Run Selection as the primary interface,
// but the user can switch this.
@@ -1393,11 +1392,11 @@
// Update the links as appropriate
if (primaryActionIsRunAll) {
runPrimaryActionButtonAsSelection = nil;
- [runPrimaryActionButton setTitle:runAllTitle];
- [runPrimaryActionMenuItem setTitle:runAllTitle];
+ [runPrimaryActionButton setTitle:NSLocalizedString(@"Run All", @"run all button")];
+ [runPrimaryActionMenuItem setTitle:NSLocalizedString(@"Run All Queries", @"Run All menu item title")];
} else {
runPrimaryActionButtonAsSelection = runPrimaryActionButton;
- [runSecondaryActionMenuItem setTitle:runAllTitle];
+ [runSecondaryActionMenuItem setTitle:NSLocalizedString(@"Run All Queries", @"Run All menu item title")];
}
// Update the Run Current/Previous/Selection menu item (and button if appropriate)