Commit: c52090144cece31ea333dd9af9f213ffc608af4c - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: c52090144cece31ea333dd9af9f213ffc608af4c (tree)
• Time: 2012-08-24 05:41:50
• Author: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Sticky settings, initial commit

There is more work to do here, like also setup the Preferences window to use settings_t::set (probably via a Cocoa wrapper we can bind to), but this is a decent start and takes care of most of the reported annoyances.

Change Summary

• modified: Frameworks/OakTextView/src/OakDocumentView.mm
• modified: Frameworks/OakTextView/src/OakTextView.mm

Incremental Difference

--- a/Frameworks/OakTextView/src/OakDocumentView.mm
+++ b/Frameworks/OakTextView/src/OakDocumentView.mm
@@ -301,7 +301,9 @@ private:
 - (void)takeSpellingLanguageFrom:(id)sender
 {
 	[[NSSpellChecker sharedSpellChecker] setLanguage:[sender representedObject]];
-	document->buffer().set_spelling_language(to_s((NSString*)[sender representedObject]));
+	std::string const language = to_s((NSString*)[sender representedObject]);
+	document->buffer().set_spelling_language(language);
+	settings_t::set(kSettingsSpellingLanguageKey, language, NULL_STR, document->path());
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem*)aMenuItem

--- a/Frameworks/OakTextView/src/OakTextView.mm
+++ b/Frameworks/OakTextView/src/OakTextView.mm
@@ -1702,6 +1702,8 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
 - (void)setTheme:(theme_ptr const&)newTheme
 {
 	theme = newTheme;
+	if(theme)
+		settings_t::set(kSettingsThemeKey, theme->uuid());
 
 	if(document)
 	{
@@ -1725,6 +1727,9 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
 	fontName = to_s([newFont fontName]);
 	fontSize = [newFont pointSize];
 
+	settings_t::set(kSettingsFontNameKey, fontName);
+	settings_t::set(kSettingsFontSizeKey, fontSize);
+
 	if(layout)
 	{
 		AUTO_REFRESH;
@@ -1736,12 +1741,16 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
 {
 	AUTO_REFRESH;
 	if(document)
+	{
 		document->buffer().indent().set_tab_size(newTabSize);
+		settings_t::set(kSettingsTabSizeKey, newTabSize, document->file_type());
+	}
 }
 
 - (void)setShowInvisibles:(BOOL)flag
 {
 	showInvisibles = flag;
+	settings_t::set(kSettingsShowInvisiblesKey, (bool)showInvisibles);
 	[self setNeedsDisplay:YES];
 }
 
@@ -1751,13 +1760,17 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
 	{
 		AUTO_REFRESH;
 		layout->set_wrapping(flag, wrapColumn);
+		settings_t::set(kSettingsSoftWrapKey, (bool)flag, document->file_type());
 	}
 }
 
 - (void)setSoftTabs:(BOOL)flag
 {
 	if(flag != self.softTabs)
+	{
 		document->buffer().indent().set_soft_tabs(flag);
+		settings_t::set(kSettingsSoftTabsKey, (bool)flag, document->file_type());
+	}
 }
 
 - (void)takeWrapColumnFrom:(id)sender
@@ -1771,6 +1784,7 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
 	// 	;
 
 	wrapColumn = [sender tag];
+	settings_t::set(kSettingsWrapColumnKey, wrapColumn, document->file_type());
 	if(layout)
 	{
 		AUTO_REFRESH;