Tracker: style fixes to TrackerSettings

This commit is contained in:
John Scipione
2014-06-20 21:29:53 -04:00
parent a92b628772
commit 4c0810574e
2 changed files with 109 additions and 107 deletions
+42 -41
View File
@@ -42,58 +42,59 @@ All rights reserved.
class TTrackerState : public Settings { class TTrackerState : public Settings {
public: public:
static TTrackerState* Get(); static TTrackerState* Get();
void Release(); void Release();
void LoadSettingsIfNeeded(); void LoadSettingsIfNeeded();
void SaveSettings(bool onlyIfNonDefault = true); void SaveSettings(bool onlyIfNonDefault = true);
TTrackerState(); TTrackerState();
~TTrackerState(); ~TTrackerState();
private: private:
friend class BPrivate::TrackerSettings; friend class BPrivate::TrackerSettings;
static void InitIfNeeded(); static void InitIfNeeded();
TTrackerState(const TTrackerState&); TTrackerState(const TTrackerState&);
BooleanValueSetting* fShowDisksIcon; BooleanValueSetting* fShowDisksIcon;
BooleanValueSetting* fMountVolumesOntoDesktop; BooleanValueSetting* fMountVolumesOntoDesktop;
BooleanValueSetting* fDesktopFilePanelRoot; BooleanValueSetting* fDesktopFilePanelRoot;
BooleanValueSetting* fMountSharedVolumesOntoDesktop; BooleanValueSetting* fMountSharedVolumesOntoDesktop;
BooleanValueSetting* fEjectWhenUnmounting; BooleanValueSetting* fEjectWhenUnmounting;
BooleanValueSetting* fShowFullPathInTitleBar; BooleanValueSetting* fShowFullPathInTitleBar;
BooleanValueSetting* fSingleWindowBrowse; BooleanValueSetting* fSingleWindowBrowse;
BooleanValueSetting* fShowNavigator; BooleanValueSetting* fShowNavigator;
BooleanValueSetting* fShowSelectionWhenInactive; BooleanValueSetting* fShowSelectionWhenInactive;
BooleanValueSetting* fTransparentSelection; BooleanValueSetting* fTransparentSelection;
BooleanValueSetting* fSortFolderNamesFirst; BooleanValueSetting* fSortFolderNamesFirst;
BooleanValueSetting* fHideDotFiles; BooleanValueSetting* fHideDotFiles;
BooleanValueSetting* fTypeAheadFiltering; BooleanValueSetting* fTypeAheadFiltering;
ScalarValueSetting* fRecentApplicationsCount; ScalarValueSetting* fRecentApplicationsCount;
ScalarValueSetting* fRecentDocumentsCount; ScalarValueSetting* fRecentDocumentsCount;
ScalarValueSetting* fRecentFoldersCount; ScalarValueSetting* fRecentFoldersCount;
BooleanValueSetting* fShowVolumeSpaceBar; BooleanValueSetting* fShowVolumeSpaceBar;
HexScalarValueSetting* fUsedSpaceColor; HexScalarValueSetting* fUsedSpaceColor;
HexScalarValueSetting* fFreeSpaceColor; HexScalarValueSetting* fFreeSpaceColor;
HexScalarValueSetting* fWarningSpaceColor; HexScalarValueSetting* fWarningSpaceColor;
BooleanValueSetting* fDontMoveFilesToTrash; BooleanValueSetting* fDontMoveFilesToTrash;
BooleanValueSetting* fAskBeforeDeleteFile; BooleanValueSetting* fAskBeforeDeleteFile;
Benaphore fInitLock; Benaphore fInitLock;
bool fInited; bool fInited;
bool fSettingsLoaded; bool fSettingsLoaded;
int32 fUseCounter; int32 fUseCounter;
typedef Settings _inherited; typedef Settings _inherited;
}; };
static TTrackerState gTrackerState; static TTrackerState gTrackerState;
@@ -116,7 +117,7 @@ int32 ColorToValue(rgb_color color)
} }
// #pragma mark - // #pragma mark - TTrackerState
TTrackerState::TTrackerState() TTrackerState::TTrackerState()
@@ -181,7 +182,7 @@ TTrackerState::LoadSettingsIfNeeded()
Add(fHideDotFiles = new BooleanValueSetting("HideDotFiles", false)); Add(fHideDotFiles = new BooleanValueSetting("HideDotFiles", false));
Add(fTypeAheadFiltering Add(fTypeAheadFiltering
= new BooleanValueSetting("TypeAheadFiltering", false)); = new BooleanValueSetting("TypeAheadFiltering", false));
Add(fSingleWindowBrowse Add(fSingleWindowBrowse
= new BooleanValueSetting("SingleWindowBrowse", false)); = new BooleanValueSetting("SingleWindowBrowse", false));
Add(fShowNavigator = new BooleanValueSetting("ShowNavigator", false)); Add(fShowNavigator = new BooleanValueSetting("ShowNavigator", false));
@@ -218,7 +219,7 @@ TTrackerState::LoadSettingsIfNeeded()
} }
// #pragma mark - // #pragma mark - TrackerSettings
TrackerSettings::TrackerSettings() TrackerSettings::TrackerSettings()
+67 -66
View File
@@ -42,91 +42,92 @@ All rights reserved.
namespace BPrivate { namespace BPrivate {
enum FormatSeparator { enum FormatSeparator {
kNoSeparator, kNoSeparator,
kSpaceSeparator, kSpaceSeparator,
kMinusSeparator, kMinusSeparator,
kSlashSeparator, kSlashSeparator,
kBackslashSeparator, kBackslashSeparator,
kDotSeparator, kDotSeparator,
kSeparatorsEnd kSeparatorsEnd
}; };
enum DateOrder { enum DateOrder {
kYMDFormat, kYMDFormat,
kDMYFormat, kDMYFormat,
kMDYFormat, kMDYFormat,
kDateFormatEnd kDateFormatEnd
}; };
class TrackerSettings { class TrackerSettings {
public: public:
TrackerSettings(); TrackerSettings();
//TTrackerState* Settings() const { return fSettings; } //TTrackerState* Settings() const { return fSettings; }
void SaveSettings(bool onlyIfNonDefault = true); void SaveSettings(bool onlyIfNonDefault = true);
bool ShowDisksIcon(); bool ShowDisksIcon();
void SetShowDisksIcon(bool); void SetShowDisksIcon(bool);
bool DesktopFilePanelRoot(); bool DesktopFilePanelRoot();
void SetDesktopFilePanelRoot(bool); void SetDesktopFilePanelRoot(bool);
bool MountVolumesOntoDesktop(); bool MountVolumesOntoDesktop();
void SetMountVolumesOntoDesktop(bool); void SetMountVolumesOntoDesktop(bool);
bool MountSharedVolumesOntoDesktop(); bool MountSharedVolumesOntoDesktop();
void SetMountSharedVolumesOntoDesktop(bool); void SetMountSharedVolumesOntoDesktop(bool);
bool EjectWhenUnmounting(); bool EjectWhenUnmounting();
void SetEjectWhenUnmounting(bool); void SetEjectWhenUnmounting(bool);
bool ShowVolumeSpaceBar(); bool ShowVolumeSpaceBar();
void SetShowVolumeSpaceBar(bool); void SetShowVolumeSpaceBar(bool);
rgb_color UsedSpaceColor(); rgb_color UsedSpaceColor();
void SetUsedSpaceColor(rgb_color color); void SetUsedSpaceColor(rgb_color color);
rgb_color FreeSpaceColor(); rgb_color FreeSpaceColor();
void SetFreeSpaceColor(rgb_color color); void SetFreeSpaceColor(rgb_color color);
rgb_color WarningSpaceColor(); rgb_color WarningSpaceColor();
void SetWarningSpaceColor(rgb_color color); void SetWarningSpaceColor(rgb_color color);
bool ShowFullPathInTitleBar(); bool ShowFullPathInTitleBar();
void SetShowFullPathInTitleBar(bool); void SetShowFullPathInTitleBar(bool);
bool SortFolderNamesFirst(); bool SortFolderNamesFirst();
void SetSortFolderNamesFirst(bool); void SetSortFolderNamesFirst(bool);
bool HideDotFiles(); bool HideDotFiles();
void SetHideDotFiles(bool hide); void SetHideDotFiles(bool hide);
bool TypeAheadFiltering(); bool TypeAheadFiltering();
void SetTypeAheadFiltering(bool enabled); void SetTypeAheadFiltering(bool enabled);
bool ShowSelectionWhenInactive(); bool ShowSelectionWhenInactive();
void SetShowSelectionWhenInactive(bool); void SetShowSelectionWhenInactive(bool);
bool TransparentSelection(); bool TransparentSelection();
void SetTransparentSelection(bool); void SetTransparentSelection(bool);
bool SingleWindowBrowse(); bool SingleWindowBrowse();
void SetSingleWindowBrowse(bool); void SetSingleWindowBrowse(bool);
bool ShowNavigator(); bool ShowNavigator();
void SetShowNavigator(bool); void SetShowNavigator(bool);
void RecentCounts(int32* applications, int32* documents, void RecentCounts(int32* applications, int32* documents,
int32* folders); int32* folders);
void SetRecentApplicationsCount(int32); void SetRecentApplicationsCount(int32);
void SetRecentDocumentsCount(int32); void SetRecentDocumentsCount(int32);
void SetRecentFoldersCount(int32); void SetRecentFoldersCount(int32);
FormatSeparator TimeFormatSeparator(); FormatSeparator TimeFormatSeparator();
void SetTimeFormatSeparator(FormatSeparator); void SetTimeFormatSeparator(FormatSeparator);
DateOrder DateOrderFormat(); DateOrder DateOrderFormat();
void SetDateOrderFormat(DateOrder); void SetDateOrderFormat(DateOrder);
bool ClockIs24Hr(); bool ClockIs24Hr();
void SetClockTo24Hr(bool); void SetClockTo24Hr(bool);
bool DontMoveFilesToTrash(); bool DontMoveFilesToTrash();
void SetDontMoveFilesToTrash(bool); void SetDontMoveFilesToTrash(bool);
bool AskBeforeDeleteFile(); bool AskBeforeDeleteFile();
void SetAskBeforeDeleteFile(bool); void SetAskBeforeDeleteFile(bool);
private: private:
//TTrackerState* fSettings; //TTrackerState* fSettings;
}; };
} // namespace BPrivate } // namespace BPrivate
#endif // _TRACKER_SETTINGS_H #endif // _TRACKER_SETTINGS_H