rpms/realcrypt/devel realcrypt-7.0a-rebranding.patch, 1.1,
1.2 realcrypt.spec, 1.14, 1.15
Leigh Scott
leigh123linux at rpmfusion.org
Sat Dec 18 15:25:08 CET 2010
- Previous message: rpms/xtables-addons-kmod/F-14 xtables-addons-kmod.spec,1.12,1.13
- Next message: rpms/realcrypt/F-13 realcrypt-rpm_opt_flags.patch, 1.3,
1.4 realcrypt.spec, 1.11, 1.12 sources, 1.6,
1.7 realcrypt-6.3-rebranding.patch, 1.2,
NONE realcrypt-6.3a-rebranding.patch, 1.3,
NONE realcrypt-Makefile.patch, 1.3,
NONE realcrypt-no-userguide-menuitem.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: leigh123linux
Update of /cvs/nonfree/rpms/realcrypt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4035
Modified Files:
realcrypt-7.0a-rebranding.patch realcrypt.spec
Log Message:
* Wed Dec 15 2010 leigh scott <leigh123linux at googlemail.com> - 7.0a-1
- update to 7.0a
realcrypt-7.0a-rebranding.patch:
Main/CommandLineInterface.cpp | 2
truecrypt-7.0a-source/Common/Language.xml | 630 ++++++------
truecrypt-7.0a-source/Common/Tcdefs.h | 10
truecrypt-7.0a-source/Core/Unix/CoreService.cpp | 2
truecrypt-7.0a-source/Core/Unix/CoreUnix.cpp | 8
truecrypt-7.0a-source/Core/Unix/CoreUnix.h | 2
truecrypt-7.0a-source/Core/Unix/Linux/CoreLinux.cpp | 4
truecrypt-7.0a-source/Driver/Fuse/FuseService.h | 2
truecrypt-7.0a-source/Main/Application.h | 2
truecrypt-7.0a-source/Main/Forms/AboutDialog.cpp | 4
truecrypt-7.0a-source/Main/Forms/Forms.cpp | 18
truecrypt-7.0a-source/Main/Forms/Forms.h | 14
truecrypt-7.0a-source/Main/Forms/MainFrame.cpp | 2
truecrypt-7.0a-source/Main/Forms/MainFrame.h | 2
truecrypt-7.0a-source/Main/Forms/VolumeCreationWizard.cpp | 2
truecrypt-7.0a-source/Main/Forms/VolumePropertiesDialog.cpp | 2
truecrypt-7.0a-source/Main/GraphicUserInterface.cpp | 51
truecrypt-7.0a-source/Main/LanguageStrings.cpp | 20
truecrypt-7.0a-source/Main/UserInterface.cpp | 42
truecrypt-7.0a-source/Makefile | 2
truecrypt-7.0a-source/Platform/Unix/SystemLog.cpp | 4
21 files changed, 393 insertions(+), 432 deletions(-)
Index: realcrypt-7.0a-rebranding.patch
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/devel/realcrypt-7.0a-rebranding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt-7.0a-rebranding.patch 15 Dec 2010 14:43:42 -0000 1.1
+++ realcrypt-7.0a-rebranding.patch 18 Dec 2010 14:25:07 -0000 1.2
@@ -1289,7 +1289,7 @@
VersionStaticText->SetLabel (Application::GetName() + L" " + StringConverter::ToWide (Version::String()));
CopyrightStaticText->SetLabel (StringConverter::ToWide (TC_STR_RELEASED_BY));
- WebsiteHyperlink->SetLabel (L"www.truecrypt.org");
-+ WebsiteHyperlink->SetLabel (L"Release for openSUSE by Packman\n" L"RealCrypt is a RPM Fusion rebrand of TrueCrypt, freely available at www.truecrypt.org");
++ WebsiteHyperlink->SetLabel (L"RealCrypt is a RPM Fusion rebrand of TrueCrypt, freely available at www.truecrypt.org");
CreditsTextCtrl->SetMinSize (wxSize (
Gui->GetCharWidth (CreditsTextCtrl) * 70,
@@ -1301,301 +1301,6 @@
+ L"A RPMfusion Release");
}
}
-diff -Naur truecrypt-7.0a-source.orig//Main/Forms/Forms.cpp truecrypt-7.0a-source/Main/Forms/Forms.cpp
---- truecrypt-7.0a-source.orig//Main/Forms/Forms.cpp 2010-09-05 16:32:10.000000000 +0200
-+++ truecrypt-7.0a-source/Main/Forms/Forms.cpp 2010-11-23 16:19:04.000000000 +0100
-@@ -149,9 +149,9 @@
- MainMenuBar->Append( SettingsMenu, _("Settin&gs") );
-
- HelpMenu = new wxMenu();
-- wxMenuItem* UserGuideMenuItem;
-+/* wxMenuItem* UserGuideMenuItem;
- UserGuideMenuItem = new wxMenuItem( HelpMenu, wxID_HELP, wxString( _("User's Guide") ) , wxEmptyString, wxITEM_NORMAL );
-- HelpMenu->Append( UserGuideMenuItem );
-+ HelpMenu->Append( UserGuideMenuItem );*/
-
- wxMenuItem* OnlineHelpMenuItem;
- OnlineHelpMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Online Help") ) , wxEmptyString, wxITEM_NORMAL );
-@@ -168,7 +168,7 @@
- HelpMenu->AppendSeparator();
-
- wxMenuItem* WebsiteMenuItem;
-- WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("TrueCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
-+ WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("RealCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
- HelpMenu->Append( WebsiteMenuItem );
-
- wxMenuItem* DownloadsMenuItem;
-@@ -423,7 +423,7 @@
- this->Connect( DefaultKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
- this->Connect( SecurityTokenPreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
- this->Connect( PreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
-- this->Connect( UserGuideMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
-+// this->Connect( UserGuideMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
- this->Connect( OnlineHelpMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
- this->Connect( BeginnersTutorialMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
- this->Connect( FaqMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
-@@ -487,7 +487,7 @@
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
-- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
-+// this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
-@@ -1683,7 +1683,7 @@
- wxStaticBoxSizer* sbSizer14;
- sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL );
-
-- WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after TrueCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
-+ WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after RealCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
-
- sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
-
-@@ -1757,7 +1757,7 @@
- bSizer62 = new wxBoxSizer( wxVERTICAL );
-
- wxStaticBoxSizer* sbSizer18;
-- sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("TrueCrypt Background Task") ), wxVERTICAL );
-+ sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("RealCrypt Background Task") ), wxVERTICAL );
-
- BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
-
-@@ -1801,7 +1801,7 @@
-
- LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL );
-
-- StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start TrueCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
-+ StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start RealCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
-
- LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
-
-@@ -1809,7 +1809,7 @@
-
- LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
-
-- MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted TrueCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-+ MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted RealCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
-
- LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );
-
-diff -Naur truecrypt-7.0a-source.orig//Main/Forms/Forms.h truecrypt-7.0a-source/Main/Forms/Forms.h
---- truecrypt-7.0a-source.orig//Main/Forms/Forms.h 2010-09-05 16:32:10.000000000 +0200
-+++ truecrypt-7.0a-source/Main/Forms/Forms.h 2010-11-23 16:19:04.000000000 +0100
-@@ -122,7 +122,7 @@
- virtual void OnDefaultKeyfilesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnSecurityTokenPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-- virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-+// virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnOnlineHelpMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnBeginnersTutorialMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
- virtual void OnFaqMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
-@@ -150,7 +150,7 @@
-
-
- public:
-- MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
-+ MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
- ~MainFrameBase();
-
- };
-@@ -335,7 +335,7 @@
-
-
- public:
-- EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-+ EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
- ~EncryptionTestDialogBase();
-
- };
-@@ -446,7 +446,7 @@
- wxTextCtrl* LegalNoticesTextCtrl;
-
- public:
-- LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-+ LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
- ~LegalNoticesDialogBase();
-
- };
-@@ -497,7 +497,7 @@
-
-
- public:
-- MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter TrueCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-+ MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter RealCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
- ~MountOptionsDialogBase();
-
- };
-@@ -648,7 +648,7 @@
-
-
- public:
-- RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-+ RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
- ~RandomPoolEnrichmentDialogBase();
-
- };
-@@ -1023,6 +1023,6 @@
-
- };
-
--} // namespace TrueCrypt
-+} // namespace RealCrypt
-
- #endif //__Forms__
-diff -Naur truecrypt-7.0a-source.orig//Main/Forms/MainFrame.cpp truecrypt-7.0a-source/Main/Forms/MainFrame.cpp
---- truecrypt-7.0a-source.orig//Main/Forms/MainFrame.cpp 2010-09-05 16:32:10.000000000 +0200
-+++ truecrypt-7.0a-source/Main/Forms/MainFrame.cpp 2010-11-23 16:19:04.000000000 +0100
-@@ -1365,7 +1365,7 @@
- else if (show && !mTaskBarIcon->IsIconInstalled())
- {
- #ifndef TC_MACOSX
-- mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"TrueCrypt");
-+ mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"RealCrypt");
- #endif
- }
- }
-diff -Naur truecrypt-7.0a-source.orig//Main/Forms/MainFrame.h truecrypt-7.0a-source/Main/Forms/MainFrame.h
---- truecrypt-7.0a-source.orig//Main/Forms/MainFrame.h 2010-09-05 16:32:10.000000000 +0200
-+++ truecrypt-7.0a-source/Main/Forms/MainFrame.h 2010-11-23 16:19:04.000000000 +0100
-@@ -127,7 +127,7 @@
- void OnVolumeButtonClick (wxCommandEvent& event);
- void OnVolumeDismounted (EventArgs &args) { UpdateVolumeList(); }
- void OnVolumeMounted (EventArgs &args) { UpdateVolumeList(); }
-- void OnUserGuideMenuItemSelected (wxCommandEvent& event) { Gui->OpenUserGuide (this); }
-+// void OnUserGuideMenuItemSelected (wxCommandEvent& event) { Gui->OpenUserGuide (this); }
- void OnWebsiteMenuItemSelected (wxCommandEvent& event) { Gui->OpenHomepageLink (this, L"website"); }
- void OnWipeCacheButtonClick (wxCommandEvent& event);
- void OrganizeFavorites (const FavoriteVolumeList &favorites, size_t newItemCount = 0);
-diff -Naur truecrypt-7.0a-source.orig//Main/Forms/TrueCrypt.fbp truecrypt-7.0a-source/Main/Forms/TrueCrypt.fbp
---- truecrypt-7.0a-source.orig//Main/Forms/TrueCrypt.fbp 2010-09-05 16:32:10.000000000 +0200
-+++ truecrypt-7.0a-source/Main/Forms/TrueCrypt.fbp 2010-11-23 16:19:04.000000000 +0100
-@@ -11,8 +11,8 @@
- <property name="first_id">1000</property>
- <property name="help_provider">none</property>
- <property name="internationalize">1</property>
-- <property name="name">TrueCrypt</property>
-- <property name="namespace">"TrueCrypt"</property>
-+ <property name="name">RealCrypt</property>
-+ <property name="namespace">"RealCrypt"</property>
- <property name="path">.</property>
- <property name="precompiled_header">#include "System.h"</property>
- <property name="relative_path">1</property>
-@@ -35,7 +35,7 @@
- <property name="size">-1,496</property>
- <property name="style">wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU</property>
- <property name="subclass"></property>
-- <property name="title">TrueCrypt</property>
-+ <property name="title">RealCrypt</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
-@@ -576,12 +576,12 @@
- <property name="label">&Help</property>
- <property name="name">HelpMenu</property>
- <property name="permission">protected</property>
-- <object class="wxMenuItem" expanded="1">
-+<!-- <object class="wxMenuItem" expanded="1">
- <property name="bitmap"></property>
- <property name="checked">0</property>
- <property name="enabled">1</property>
- <property name="help"></property>
-- <property name="id">wxID_HELP</property>
-+ <PRoperty name="id">wxID_HELP</property>
- <property name="kind">wxITEM_NORMAL</property>
- <property name="label">User's Guide</property>
- <property name="name">UserGuideMenuItem</property>
-@@ -590,7 +590,7 @@
- <property name="unchecked_bitmap"></property>
- <event name="OnMenuSelection">OnUserGuideMenuItemSelected</event>
- <event name="OnUpdateUI"></event>
-- </object>
-+ </object> -->
- <object class="wxMenuItem" expanded="1">
- <property name="bitmap"></property>
- <property name="checked">0</property>
-@@ -646,7 +646,7 @@
- <property name="help"></property>
- <property name="id">wxID_ANY</property>
- <property name="kind">wxITEM_NORMAL</property>
-- <property name="label">TrueCrypt Website</property>
-+ <property name="label">RealCrypt Website</property>
- <property name="name">WebsiteMenuItem</property>
- <property name="permission">none</property>
- <property name="shortcut"></property>
-@@ -4064,7 +4064,7 @@
- <property name="size"></property>
- <property name="style">wxDEFAULT_DIALOG_STYLE</property>
- <property name="subclass"></property>
-- <property name="title">TrueCrypt - Test Vectors</property>
-+ <property name="title">RealCrypt - Test Vectors</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
-@@ -6858,7 +6858,7 @@
- <property name="size"></property>
- <property name="style">wxDEFAULT_DIALOG_STYLE</property>
- <property name="subclass"></property>
-- <property name="title">TrueCrypt - Legal Notices</property>
-+ <property name="title">RealCrypt - Legal Notices</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
-@@ -7035,7 +7035,7 @@
- <property name="size">-1,-1</property>
- <property name="style">wxDEFAULT_DIALOG_STYLE</property>
- <property name="subclass"></property>
-- <property name="title">Enter TrueCrypt Volume Password</property>
-+ <property name="title">Enter RealCrypt Volume Password</property>
- <property name="tooltip"></property>
- <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
- <property name="window_name"></property>
-@@ -9113,7 +9113,7 @@
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
-- <property name="label">Wipe after TrueCrypt window has been closed</property>
-+ <property name="label">Wipe after RealCrypt window has been closed</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">WipeCacheOnCloseCheckBox</property>
-@@ -9650,7 +9650,7 @@
- <property name="proportion">0</property>
- <object class="wxStaticBoxSizer" expanded="1">
- <property name="id">wxID_ANY</property>
-- <property name="label">TrueCrypt Background Task</property>
-+ <property name="label">RealCrypt Background Task</property>
- <property name="minimum_size"></property>
- <property name="name">sbSizer18</property>
- <property name="orient">wxVERTICAL</property>
-@@ -10022,7 +10022,7 @@
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
-- <property name="label">Start TrueCrypt Background Task</property>
-+ <property name="label">Start RealCrypt Background Task</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">StartOnLogonCheckBox</property>
-@@ -10126,7 +10126,7 @@
- <property name="font"></property>
- <property name="hidden">0</property>
- <property name="id">wxID_ANY</property>
-- <property name="label">Mount all device-hosted TrueCrypt volumes</property>
-+ <property name="label">Mount all device-hosted RealCrypt volumes</property>
- <property name="maximum_size"></property>
- <property name="minimum_size"></property>
- <property name="name">MountDevicesOnLogonCheckBox</property>
-@@ -11804,7 +11804,7 @@
- <property name="size"></property>
- <property name="style">wxDEFAULT_DIALOG_STYLE</property>
- <property name="subclass"></property>
-- <property name="title">TrueCrypt - Random Pool Enrichment</property>
-+ <property name="title">RealCrypt - Random Pool Enrichment</property>
- <property name="tooltip"></property>
- <property name="window_extra_style"></property>
- <property name="window_name"></property>
diff -Naur truecrypt-7.0a-source.orig//Main/Forms/VolumeCreationWizard.cpp truecrypt-7.0a-source/Main/Forms/VolumeCreationWizard.cpp
--- truecrypt-7.0a-source.orig//Main/Forms/VolumeCreationWizard.cpp 2010-09-05 16:32:10.000000000 +0200
+++ truecrypt-7.0a-source/Main/Forms/VolumeCreationWizard.cpp 2010-11-23 16:19:04.000000000 +0100
@@ -1934,3 +1639,171 @@
parser.AddOption (L"", L"new-keyfiles", _("New keyfiles"));
parser.AddOption (L"", L"new-password", _("New password"));
parser.AddSwitch (L"", L"non-interactive", _("Do not interact with user"));
+diff -Naur truecrypt-7.0a-source.orig//Main/Forms/Forms.h truecrypt-7.0a-source/Main/Forms/Forms.h
+--- truecrypt-7.0a-source.orig//Main/Forms/Forms.h 2010-09-05 16:32:10.000000000 +0200
++++ truecrypt-7.0a-source/Main/Forms/Forms.h 2010-11-23 16:19:04.000000000 +0100
+@@ -122,7 +122,7 @@
+ virtual void OnDefaultKeyfilesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnSecurityTokenPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnPreferencesMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+- virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
++// virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnOnlineHelpMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnBeginnersTutorialMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+ virtual void OnFaqMenuItemSelected( wxCommandEvent& event ){ event.Skip(); }
+@@ -150,7 +150,7 @@
+
+
+ public:
+- MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
++ MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,496 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
+ ~MainFrameBase();
+
+ };
+@@ -335,7 +335,7 @@
+
+
+ public:
+- EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
++ EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+ ~EncryptionTestDialogBase();
+
+ };
+@@ -446,7 +446,7 @@
+ wxTextCtrl* LegalNoticesTextCtrl;
+
+ public:
+- LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
++ LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+ ~LegalNoticesDialogBase();
+
+ };
+@@ -497,7 +497,7 @@
+
+
+ public:
+- MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter TrueCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
++ MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter RealCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+ ~MountOptionsDialogBase();
+
+ };
+@@ -648,7 +648,7 @@
+
+
+ public:
+- RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("TrueCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
++ RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+ ~RandomPoolEnrichmentDialogBase();
+
+ };
+@@ -1023,6 +1023,6 @@
+
+ };
+
+-} // namespace TrueCrypt
++} // namespace RealCrypt
+
+ #endif //__Forms__
+diff -Naur truecrypt-7.0a-source.orig//Main/Forms/Forms.cpp truecrypt-7.0a-source/Main/Forms/Forms.cpp
+--- truecrypt-7.0a-source.orig//Main/Forms/Forms.cpp 2010-09-05 16:32:10.000000000 +0200
++++ truecrypt-7.0a-source/Main/Forms/Forms.cpp 2010-11-23 16:19:04.000000000 +0100
+@@ -149,9 +149,9 @@
+ MainMenuBar->Append( SettingsMenu, _("Settin&gs") );
+
+ HelpMenu = new wxMenu();
+- wxMenuItem* UserGuideMenuItem;
++/* wxMenuItem* UserGuideMenuItem;
+ UserGuideMenuItem = new wxMenuItem( HelpMenu, wxID_HELP, wxString( _("User's Guide") ) , wxEmptyString, wxITEM_NORMAL );
+- HelpMenu->Append( UserGuideMenuItem );
++ HelpMenu->Append( UserGuideMenuItem );*/
+
+ wxMenuItem* OnlineHelpMenuItem;
+ OnlineHelpMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Online Help") ) , wxEmptyString, wxITEM_NORMAL );
+@@ -168,7 +168,7 @@
+ HelpMenu->AppendSeparator();
+
+ wxMenuItem* WebsiteMenuItem;
+- WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("TrueCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
++ WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("RealCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
+ HelpMenu->Append( WebsiteMenuItem );
+
+ wxMenuItem* DownloadsMenuItem;
+@@ -423,7 +423,7 @@
+ this->Connect( DefaultKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
+ this->Connect( SecurityTokenPreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
+ this->Connect( PreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
+- this->Connect( UserGuideMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
++// this->Connect( UserGuideMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
+ this->Connect( OnlineHelpMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
+ this->Connect( BeginnersTutorialMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
+ this->Connect( FaqMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
+@@ -487,7 +487,7 @@
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) );
+- this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
++// this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) );
+ this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) );
+@@ -1683,7 +1683,7 @@
+ wxStaticBoxSizer* sbSizer14;
+ sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL );
+
+- WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after TrueCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
++ WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after RealCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
+
+@@ -1757,7 +1757,7 @@
+ bSizer62 = new wxBoxSizer( wxVERTICAL );
+
+ wxStaticBoxSizer* sbSizer18;
+- sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("TrueCrypt Background Task") ), wxVERTICAL );
++ sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("RealCrypt Background Task") ), wxVERTICAL );
+
+ BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
+
+@@ -1801,7 +1801,7 @@
+
+ LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL );
+
+- StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start TrueCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
++ StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start RealCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
+
+@@ -1809,7 +1809,7 @@
+
+ LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
+
+- MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted TrueCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
++ MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted RealCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
+
+ LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );
+
+
+diff -Naur truecrypt-7.0a-source.orig//Main/Forms/MainFrame.cpp truecrypt-7.0a-source/Main/Forms/MainFrame.cpp
+--- truecrypt-7.0a-source.orig//Main/Forms/MainFrame.cpp 2010-09-05 16:32:10.000000000 +0200
++++ truecrypt-7.0a-source/Main/Forms/MainFrame.cpp 2010-11-23 16:19:04.000000000 +0100
+@@ -1365,7 +1365,7 @@
+ else if (show && !mTaskBarIcon->IsIconInstalled())
+ {
+ #ifndef TC_MACOSX
+- mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"TrueCrypt");
++ mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"RealCrypt");
+ #endif
+ }
+ }
+diff -Naur truecrypt-7.0a-source.orig//Main/Forms/MainFrame.h truecrypt-7.0a-source/Main/Forms/MainFrame.h
+--- truecrypt-7.0a-source.orig//Main/Forms/MainFrame.h 2010-09-05 16:32:10.000000000 +0200
++++ truecrypt-7.0a-source/Main/Forms/MainFrame.h 2010-11-23 16:19:04.000000000 +0100
+@@ -127,7 +127,7 @@
+ void OnVolumeButtonClick (wxCommandEvent& event);
+ void OnVolumeDismounted (EventArgs &args) { UpdateVolumeList(); }
+ void OnVolumeMounted (EventArgs &args) { UpdateVolumeList(); }
+- void OnUserGuideMenuItemSelected (wxCommandEvent& event) { Gui->OpenUserGuide (this); }
++// void OnUserGuideMenuItemSelected (wxCommandEvent& event) { Gui->OpenUserGuide (this); }
+ void OnWebsiteMenuItemSelected (wxCommandEvent& event) { Gui->OpenHomepageLink (this, L"website"); }
+ void OnWipeCacheButtonClick (wxCommandEvent& event);
+ void OrganizeFavorites (const FavoriteVolumeList &favorites, size_t newItemCount = 0);
Index: realcrypt.spec
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/devel/realcrypt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- realcrypt.spec 15 Dec 2010 14:39:06 -0000 1.14
+++ realcrypt.spec 18 Dec 2010 14:25:07 -0000 1.15
@@ -88,7 +88,8 @@
lzcat %{SOURCE20} > ./Resources/Icons/TrueCrypt-16x16.xpm
%build
-sed -i -e 's,TrueCrypt,RealCrypt,g' Main/Forms/Forms.cpp Main/Forms/Forms.h Main/LanguageStrings.cpp
+sed -i 579,+14d Main/Forms/TrueCrypt.fbp
+sed -i -e 's,TrueCrypt,RealCrypt,g' Main/Forms/Forms.cpp Main/Forms/Forms.h Main/LanguageStrings.cpp Main/Forms/TrueCrypt.fbp
sed -i -e 's,namespace RealCrypt,namespace TrueCrypt,g' Main/Forms/Forms.cpp Main/Forms/Forms.h Main/LanguageStrings.cpp
make \
- Previous message: rpms/xtables-addons-kmod/F-14 xtables-addons-kmod.spec,1.12,1.13
- Next message: rpms/realcrypt/F-13 realcrypt-rpm_opt_flags.patch, 1.3,
1.4 realcrypt.spec, 1.11, 1.12 sources, 1.6,
1.7 realcrypt-6.3-rebranding.patch, 1.2,
NONE realcrypt-6.3a-rebranding.patch, 1.3,
NONE realcrypt-Makefile.patch, 1.3,
NONE realcrypt-no-userguide-menuitem.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list