From: Eric Petit <titer@videolan.org>
Date: Tue, 13 May 2003 11:18:25 +0000 (+0000)
Subject:  modules/gui/beos/PreferencesWindow.*: use config_ResetAll()
X-Git-Tag: 0.6.0~305
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=33aec41207c2f5d8c1cad1f63aba1ff8b32e3d70;p=vlc

 modules/gui/beos/PreferencesWindow.*: use config_ResetAll()
---

diff --git a/modules/gui/beos/PreferencesWindow.cpp b/modules/gui/beos/PreferencesWindow.cpp
index e3c6fa8252..9b97a39f79 100644
--- a/modules/gui/beos/PreferencesWindow.cpp
+++ b/modules/gui/beos/PreferencesWindow.cpp
@@ -2,7 +2,7 @@
  * PreferencesWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: PreferencesWindow.cpp,v 1.19 2003/05/08 10:45:50 titer Exp $
+ * $Id: PreferencesWindow.cpp,v 1.20 2003/05/13 11:18:25 titer Exp $
  *
  * Authors: Eric Petit <titer@videolan.org>
  *
@@ -275,20 +275,16 @@ PreferencesWindow::PreferencesWindow( intf_thread_t * p_interface,
     rect.InsetBy( 10, 10 );
     rect.left = rect.right - 80;
     rect.top = rect.bottom - 25;
-    button = new BButton( rect, "", _("Close"), new BMessage( PREFS_CLOSE ),
-                          B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM );
-    button->MakeDefault( true );
-    fPrefsView->AddChild( button );
-    rect.OffsetBy( -90, 0 );
     button = new BButton( rect, "", _("Apply"), new BMessage( PREFS_APPLY ),
                           B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM );
+    button->MakeDefault( true );
     fPrefsView->AddChild( button );
     rect.OffsetBy( -90, 0 );
     button = new BButton( rect, "", _("Save"), new BMessage( PREFS_SAVE ),
                           B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM );
     fPrefsView->AddChild( button );
     rect.OffsetBy( -90, 0 );
-    button = new BButton( rect, "", _("Revert"), new BMessage( PREFS_REVERT ),
+    button = new BButton( rect, "", _("Defaults"), new BMessage( PREFS_DEFAULTS ),
                           B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM );
     fPrefsView->AddChild( button );
     
@@ -324,11 +320,8 @@ void PreferencesWindow::MessageReceived( BMessage * message )
             Update();
             break;
         
-        case PREFS_CLOSE:
-            PostMessage( B_QUIT_REQUESTED );
-            break;
-        
-        case PREFS_REVERT:
+        case PREFS_DEFAULTS:
+            config_ResetAll( p_intf );
             ApplyChanges( false );
             break;
         
diff --git a/modules/gui/beos/PreferencesWindow.h b/modules/gui/beos/PreferencesWindow.h
index a7ce9d611a..e9f6d0cc35 100644
--- a/modules/gui/beos/PreferencesWindow.h
+++ b/modules/gui/beos/PreferencesWindow.h
@@ -2,7 +2,7 @@
  * PreferencesWindow.h
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: PreferencesWindow.h,v 1.12 2003/05/07 17:27:30 titer Exp $
+ * $Id: PreferencesWindow.h,v 1.13 2003/05/13 11:18:25 titer Exp $
  *
  * Authors: Eric Petit <titer@videolan.org>
  *
@@ -29,8 +29,7 @@
 #define PREFS_WINDOW_WIDTH   600
 #define PREFS_WINDOW_HEIGHT  400
 #define PREFS_ITEM_SELECTED  'pris'
-#define PREFS_CLOSE          'prcl'
-#define PREFS_REVERT         'prre'
+#define PREFS_DEFAULTS       'prde'
 #define PREFS_APPLY          'prap'
 #define PREFS_SAVE           'prsa'
 #define TEXT_HEIGHT 16