diff --git a/cocoa/base/AppDelegate.h b/cocoa/base/AppDelegate.h
index 65825aa2..077198d1 100644
--- a/cocoa/base/AppDelegate.h
+++ b/cocoa/base/AppDelegate.h
@@ -23,6 +23,7 @@ http://www.hardcoded.net/licenses/bsd_license
ResultWindowBase *_resultWindow;
DirectoryPanel *_directoryPanel;
DetailsPanel *_detailsPanel;
+ NSWindowController *_preferencesPanel;
HSAboutBox *_aboutBox;
HSRecentFiles *_recentResults;
}
@@ -45,5 +46,6 @@ http://www.hardcoded.net/licenses/bsd_license
- (IBAction)showAboutBox:(id)sender;
- (IBAction)openWebsite:(id)sender;
- (IBAction)openHelp:(id)sender;
+- (IBAction)showPreferencesPanel:(id)sender;
- (IBAction)toggleDirectories:(id)sender;
@end
diff --git a/cocoa/base/AppDelegate.m b/cocoa/base/AppDelegate.m
index 7d4da25d..c468e9b6 100644
--- a/cocoa/base/AppDelegate.m
+++ b/cocoa/base/AppDelegate.m
@@ -21,6 +21,7 @@ http://www.hardcoded.net/licenses/bsd_license
_directoryPanel = nil;
_detailsPanel = nil;
_aboutBox = nil;
+ _preferencesPanel = nil;
_recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu];
[_recentResults setDelegate:self];
}
@@ -100,6 +101,14 @@ http://www.hardcoded.net/licenses/bsd_license
[[NSWorkspace sharedWorkspace] openURL:u];
}
+- (IBAction)showPreferencesPanel:(id)sender
+{
+ if (_preferencesPanel == nil) {
+ _preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
+ }
+ [_preferencesPanel showWindow:sender];
+}
+
- (IBAction)toggleDirectories:(id)sender
{
[[self directoryPanel] toggleVisible:sender];
diff --git a/cocoa/base/ResultWindow.h b/cocoa/base/ResultWindow.h
index 1757b3da..a6dc2d2d 100644
--- a/cocoa/base/ResultWindow.h
+++ b/cocoa/base/ResultWindow.h
@@ -27,7 +27,6 @@ http://www.hardcoded.net/licenses/bsd_license
PyDupeGuruBase *py;
NSMenu *columnsMenu;
NSMutableArray *_resultColumns;
- NSWindowController *preferencesPanel;
ResultTable *table;
StatsLabel *statsLabel;
ProblemDialog *problemDialog;
@@ -67,7 +66,6 @@ http://www.hardcoded.net/licenses/bsd_license
- (IBAction)resetColumnsToDefault:(id)sender;
- (IBAction)revealSelected:(id)sender;
- (IBAction)saveResults:(id)sender;
-- (IBAction)showPreferencesPanel:(id)sender;
- (IBAction)startDuplicateScan:(id)sender;
- (IBAction)switchSelected:(id)sender;
- (IBAction)toggleColumn:(id)sender;
diff --git a/cocoa/base/ResultWindow.m b/cocoa/base/ResultWindow.m
index e736e9ea..29753253 100644
--- a/cocoa/base/ResultWindow.m
+++ b/cocoa/base/ResultWindow.m
@@ -22,7 +22,6 @@ http://www.hardcoded.net/licenses/bsd_license
columnsMenu = [app columnsMenu];
/* Put a cute iTunes-like bottom bar */
[[self window] setContentBorderThickness:28 forEdge:NSMinYEdge];
- preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
table = [[ResultTable alloc] initWithPyParent:py view:matches];
statsLabel = [[StatsLabel alloc] initWithPyParent:py labelView:stats];
problemDialog = [[ProblemDialog alloc] initWithPy:py];
@@ -40,7 +39,6 @@ http://www.hardcoded.net/licenses/bsd_license
- (void)dealloc
{
[table release];
- [preferencesPanel release];
[statsLabel release];
[problemDialog release];
[super dealloc];
@@ -348,11 +346,6 @@ http://www.hardcoded.net/licenses/bsd_license
[py revealSelected];
}
-- (IBAction)showPreferencesPanel:(id)sender
-{
- [preferencesPanel showWindow:sender];
-}
-
- (IBAction)saveResults:(id)sender
{
NSSavePanel *sp = [NSSavePanel savePanel];
diff --git a/cocoa/base/xib/MainMenu.xib b/cocoa/base/xib/MainMenu.xib
index 9edc618f..eeed2a40 100644
--- a/cocoa/base/xib/MainMenu.xib
+++ b/cocoa/base/xib/MainMenu.xib
@@ -12,7 +12,7 @@
1266
-
columnsMenu
@@ -1046,6 +1038,14 @@
1269
+
+
+ showPreferencesPanel:
+
+
+
+ 1270
+
@@ -1884,7 +1884,7 @@
- 1269
+ 1270
@@ -1907,6 +1907,7 @@
openHelp:
openWebsite:
showAboutBox:
+ showPreferencesPanel:
toggleDirectories:
@@ -1915,6 +1916,7 @@
id
id
id
+ id
@@ -1924,6 +1926,7 @@
openHelp:
openWebsite:
showAboutBox:
+ showPreferencesPanel:
toggleDirectories:
@@ -1940,6 +1943,10 @@
showAboutBox:
id
+
+ showPreferencesPanel:
+ id
+
toggleDirectories:
id
@@ -2192,7 +2199,6 @@
resetColumnsToDefault:
revealSelected:
saveResults:
- showPreferencesPanel:
startDuplicateScan:
switchSelected:
toggleColumn:
@@ -2231,7 +2237,6 @@
id
id
id
- id
@@ -2261,7 +2266,6 @@
resetColumnsToDefault:
revealSelected:
saveResults:
- showPreferencesPanel:
startDuplicateScan:
switchSelected:
toggleColumn:
@@ -2363,10 +2367,6 @@
saveResults:
id
-
- showPreferencesPanel:
- id
-
startDuplicateScan:
id
diff --git a/cocoa/base/xib/ResultWindow.xib b/cocoa/base/xib/ResultWindow.xib
index 71c6fee2..4614ea10 100644
--- a/cocoa/base/xib/ResultWindow.xib
+++ b/cocoa/base/xib/ResultWindow.xib
@@ -19,13 +19,8 @@
com.apple.InterfaceBuilder.CocoaPlugin
- YES
-
- YES
-
-
- YES
-
+ PluginDependencyRecalculationVersion
+
YES
@@ -140,7 +135,6 @@
YES
3E17CA47-6688-44FC-963C-CF22D780305F
4BD1D94E-8A70-48E1-AF8A-CEDC80CD0A5E
- 8021CD05-A38E-4F80-99DD-7771914CEE06
8E5ADD0F-24AD-452A-BE68-464FE9E5E240
BA65FFF2-9E56-4E88-AB2E-8FBE2B3D030F
F37510C7-955F-4141-9D09-AC2881ADCCFA
@@ -180,9 +174,11 @@
Options
-
+
268
{{0, 14}, {195, 23}}
+
+
YES
67239424
@@ -228,28 +224,6 @@
YES
0
-
-
- 8021CD05-A38E-4F80-99DD-7771914CEE06
-
- Preferences
- Preferences
-
-
-
- NSImage
- preferences32
-
-
-
- {0, 0}
- {0, 0}
- YES
- YES
- -1
- YES
- 0
-
8E5ADD0F-24AD-452A-BE68-464FE9E5E240
@@ -258,9 +232,11 @@
Filter
-
+
258
{{0, 14}, {81, 22}}
+
+
YES
343014976
@@ -380,9 +356,11 @@
Action
{1.79769e+308, 1.79769e+308}
{340, 340}
@@ -958,14 +937,6 @@
48
-
-
- showPreferencesPanel:
-
-
-
- 49
-
deleteMarked:
@@ -1205,7 +1176,6 @@
-
@@ -1330,11 +1300,6 @@
-
- 18
-
-
-
19
@@ -1555,8 +1520,6 @@
YES
YES
- -1.IBPluginDependency
- -2.IBPluginDependency
-3.IBPluginDependency
1.IBEditorWindowLastContentRect
1.IBPluginDependency
@@ -1570,9 +1533,9 @@
12.IBPluginDependency
13.IBPluginDependency
14.IBPluginDependency
+ 15.IBPluginDependency
16.IBPluginDependency
17.IBPluginDependency
- 18.IBPluginDependency
19.IBPluginDependency
2.IBEditorWindowLastContentRect
2.IBPluginDependency
@@ -1648,8 +1611,6 @@
YES
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
{{324, 305}, {557, 400}}
com.apple.InterfaceBuilder.CocoaPlugin
{{324, 305}, {557, 400}}
@@ -1769,6 +1730,7 @@
openHelp:
openWebsite:
showAboutBox:
+ showPreferencesPanel:
toggleDirectories:
@@ -1777,6 +1739,7 @@
id
id
id
+ id
@@ -1786,6 +1749,7 @@
openHelp:
openWebsite:
showAboutBox:
+ showPreferencesPanel:
toggleDirectories:
@@ -1802,6 +1766,10 @@
showAboutBox:
id
+
+ showPreferencesPanel:
+ id
+
toggleDirectories:
id
@@ -1812,27 +1780,31 @@
YES
YES
+ columnsMenu
py
recentResultsMenu
- result
YES
+ NSMenu
PyDupeGuruBase
NSMenu
- ResultWindowBase
YES
YES
+ columnsMenu
py
recentResultsMenu
- result
YES
+
+ columnsMenu
+ NSMenu
+
py
PyDupeGuruBase
@@ -1841,10 +1813,6 @@
recentResultsMenu
NSMenu
-
- result
- ResultWindowBase
-
@@ -1976,7 +1944,6 @@
resetColumnsToDefault:
revealSelected:
saveResults:
- showPreferencesPanel:
startDuplicateScan:
switchSelected:
toggleColumn:
@@ -2015,7 +1982,6 @@
id
id
id
- id
@@ -2045,7 +2011,6 @@
resetColumnsToDefault:
revealSelected:
saveResults:
- showPreferencesPanel:
startDuplicateScan:
switchSelected:
toggleColumn:
@@ -2147,10 +2112,6 @@
saveResults:
id
-
- showPreferencesPanel:
- id
-
startDuplicateScan:
id
@@ -2181,22 +2142,16 @@
YES
YES
- app
- columnsMenu
filterField
matches
optionsSwitch
- py
stats
YES
- id
- NSMenu
NSSearchField
HSTableView
NSSegmentedControl
- PyDupeGuruBase
NSTextField
@@ -2204,24 +2159,13 @@
YES
YES
- app
- columnsMenu
filterField
matches
optionsSwitch
- py
stats
YES
-
- app
- id
-
-
- columnsMenu
- NSMenu
-
filterField
NSSearchField
@@ -2234,10 +2178,6 @@
optionsSwitch
NSSegmentedControl
-
- py
- PyDupeGuruBase
-
stats
NSTextField
@@ -2847,7 +2787,6 @@
NSMenuMixedState
NSSwitch
folder32
- preferences32
YES
@@ -2857,7 +2796,6 @@
{7, 2}
{15, 15}
{32, 32}
- {32, 32}
diff --git a/cocoa/me/dupeguru.xcodeproj/project.pbxproj b/cocoa/me/dupeguru.xcodeproj/project.pbxproj
index 2013e394..3ab4aa91 100644
--- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj
@@ -68,8 +68,6 @@
CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDF07A2112493B200EE5BC0 /* StatsLabel.m */; };
CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; };
CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
- CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
- CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -181,8 +179,6 @@
CEDF07A2112493B200EE5BC0 /* StatsLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatsLabel.m; path = ../base/StatsLabel.m; sourceTree = SOURCE_ROOT; };
CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = ""; };
CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
- CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
- CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
@@ -429,8 +425,6 @@
CEFC294309C89E0000D9F998 /* images */ = {
isa = PBXGroup;
children = (
- CEFC295309C89FF200D9F998 /* details32.png */,
- CEFC295409C89FF200D9F998 /* preferences32.png */,
CEFC294509C89E3D00D9F998 /* folder32.png */,
);
name = images;
@@ -493,8 +487,6 @@
CE073F6309CAE1A3005C1D2F /* help in Resources */,
CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
- CEFC295509C89FF200D9F998 /* details32.png in Resources */,
- CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
CE6E0E9F1054EB97008D9390 /* dsa_pub.pem in Resources */,
CE3FBDD31094637800B72D77 /* DetailsPanel.xib in Resources */,
CE3FBDD41094637800B72D77 /* DirectoryPanel.xib in Resources */,
diff --git a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
index 8597c63f..05f07857 100644
--- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj
@@ -60,9 +60,6 @@
CEF12A7E124DFD400087B51D /* HSTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF12A7D124DFD400087B51D /* HSTableView.m */; };
CEF12A84124DFD620087B51D /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF12A83124DFD620087B51D /* ResultTable.m */; };
CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
- CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; };
- CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
- CEFCDE2D0AB0418600C33A93 /* dgpe_logo_32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -181,9 +178,6 @@
CEF12A82124DFD620087B51D /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; };
CEF12A83124DFD620087B51D /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; };
CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
- CEFC295309C89FF200D9F998 /* details32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = details32.png; path = ../../images/details32.png; sourceTree = SOURCE_ROOT; };
- CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
- CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dgpe_logo_32.png; path = ../../images/dgpe_logo_32.png; sourceTree = SOURCE_ROOT; };
CEFF18A009A4D387005E6321 /* PyDupeGuru.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = PyDupeGuru.h; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
@@ -436,9 +430,6 @@
CEFC294309C89E0000D9F998 /* images */ = {
isa = PBXGroup;
children = (
- CEFCDE2C0AB0418600C33A93 /* dgpe_logo_32.png */,
- CEFC295309C89FF200D9F998 /* details32.png */,
- CEFC295409C89FF200D9F998 /* preferences32.png */,
CEFC294509C89E3D00D9F998 /* folder32.png */,
);
name = images;
@@ -500,9 +491,6 @@
CE073F6309CAE1A3005C1D2F /* help in Resources */,
CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
- CEFC295509C89FF200D9F998 /* details32.png in Resources */,
- CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
- CEFCDE2D0AB0418600C33A93 /* dgpe_logo_32.png in Resources */,
CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */,
CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */,
CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */,
diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj
index 263c4c51..433b3e2b 100644
--- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj
+++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj
@@ -46,7 +46,6 @@
CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0FA10945E37001F3A39 /* DetailsPanel.xib */; };
CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */; };
CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; };
- CEFC295609C89FF200D9F998 /* preferences32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295409C89FF200D9F998 /* preferences32.png */; };
CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8B0FC9517500CD5728 /* Dialogs.m */; };
CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F8D0FC9517500CD5728 /* HSErrorReportWindow.m */; };
CEFC7FA10FC9517500CD5728 /* ProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEFC7F910FC9517500CD5728 /* ProgressController.m */; };
@@ -142,7 +141,6 @@
CEF0ACCC12DF3C2000B32F7E /* HSRecentFiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSRecentFiles.h; path = ../../cocoalib/HSRecentFiles.h; sourceTree = SOURCE_ROOT; };
CEF0ACCD12DF3C2000B32F7E /* HSRecentFiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSRecentFiles.m; path = ../../cocoalib/HSRecentFiles.m; sourceTree = SOURCE_ROOT; };
CEFC294509C89E3D00D9F998 /* folder32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = folder32.png; path = ../../images/folder32.png; sourceTree = SOURCE_ROOT; };
- CEFC295409C89FF200D9F998 /* preferences32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = preferences32.png; path = ../../images/preferences32.png; sourceTree = SOURCE_ROOT; };
CEFC7F8A0FC9517500CD5728 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = ../../cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; };
CEFC7F8B0FC9517500CD5728 /* Dialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Dialogs.m; path = ../../cocoalib/Dialogs.m; sourceTree = SOURCE_ROOT; };
CEFC7F8C0FC9517500CD5728 /* HSErrorReportWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSErrorReportWindow.h; path = ../../cocoalib/HSErrorReportWindow.h; sourceTree = SOURCE_ROOT; };
@@ -334,7 +332,6 @@
CEFC294309C89E0000D9F998 /* images */ = {
isa = PBXGroup;
children = (
- CEFC295409C89FF200D9F998 /* preferences32.png */,
CEFC294509C89E3D00D9F998 /* folder32.png */,
);
name = images;
@@ -461,7 +458,6 @@
CE073F6309CAE1A3005C1D2F /* help in Resources */,
CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */,
CEFC294609C89E3D00D9F998 /* folder32.png in Resources */,
- CEFC295609C89FF200D9F998 /* preferences32.png in Resources */,
CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */,
CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */,
CEEFC0FB10945E37001F3A39 /* DetailsPanel.xib in Resources */,