[haiku-commits] haiku: hrev44790 - in src: add-ons/disk_systems/ntfs apps/drivesetup add-ons/kernel/file_systems/ntfs apps/showimage
- From: Gerasim Troeglazov <3deyes@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 7 Nov 2012 10:25:32 +0100 (CET)
hrev44790 adds 2 changesets to branch 'master'
old head: f8cdd319702dc5b4387ca75ba96cca4291f01263
new head: 1aa6f649535f5f2e1b9edd42bf48137a3ccd8723
----------------------------------------------------------------------------
a8199d6: Fixed wrong parameters order
1aa6f64: NTFS: renamed [NTFS File System] to [NT File System] to be consistent
with Be File System
[ threedeyes <3dEyes@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 5 insertions(+), 5 deletions(-)
src/add-ons/disk_systems/ntfs/InitializeParameterEditor.cpp | 2 +-
src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp | 2 +-
src/add-ons/kernel/file_systems/ntfs/kernel_interface.c | 2 +-
src/apps/drivesetup/MainWindow.cpp | 2 +-
src/apps/showimage/ShowImageWindow.cpp | 2 +-
############################################################################
Commit: a8199d692aa28895e7e9a4cbd77121c8879ba4a4
URL: http://cgit.haiku-os.org/haiku/commit/?id=a8199d6
Author: threedeyes <3dEyes@xxxxxxxxx>
Date: Wed Nov 7 08:39:30 2012 UTC
Fixed wrong parameters order
----------------------------------------------------------------------------
diff --git a/src/apps/showimage/ShowImageWindow.cpp
b/src/apps/showimage/ShowImageWindow.cpp
index 2214476..b79059e 100644
--- a/src/apps/showimage/ShowImageWindow.cpp
+++ b/src/apps/showimage/ShowImageWindow.cpp
@@ -727,7 +727,7 @@ ShowImageWindow::MessageReceived(BMessage* message)
strCaption << i;
BMenuItem* item = new
BMenuItem(strCaption.String(), goTo,
- B_SHIFT_KEY, shortcut);
+ shortcut, B_SHIFT_KEY);
if (currentPage == i)
item->SetMarked(true);
fGoToPageMenu->AddItem(item);
############################################################################
Revision: hrev44790
Commit: 1aa6f649535f5f2e1b9edd42bf48137a3ccd8723
URL: http://cgit.haiku-os.org/haiku/commit/?id=1aa6f64
Author: threedeyes <3dEyes@xxxxxxxxx>
Date: Wed Nov 7 09:24:46 2012 UTC
NTFS: renamed [NTFS File System] to [NT File System] to be consistent with Be
File System
----------------------------------------------------------------------------
diff --git a/src/add-ons/disk_systems/ntfs/InitializeParameterEditor.cpp
b/src/add-ons/disk_systems/ntfs/InitializeParameterEditor.cpp
index ac44bfc..ba14586 100644
--- a/src/add-ons/disk_systems/ntfs/InitializeParameterEditor.cpp
+++ b/src/add-ons/disk_systems/ntfs/InitializeParameterEditor.cpp
@@ -82,7 +82,7 @@ InitializeNTFSEditor::PartitionNameChanged(const char* name)
void
InitializeNTFSEditor::_CreateViewControls()
{
- fNameTC = new BTextControl("Name:", "Haiku", NULL);
+ fNameTC = new BTextControl("Name:", "New NTFS Volume", NULL);
fNameTC->SetModificationMessage(new BMessage(MSG_NAME_CHANGED));
// TODO find out what is the max length for this specific FS partition
name
fNameTC->TextView()->SetMaxBytes(31);
diff --git a/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp
b/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp
index 75a2ac5..cde20e6 100644
--- a/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp
+++ b/src/add-ons/disk_systems/ntfs/NTFSAddOn.cpp
@@ -33,7 +33,7 @@
using std::nothrow;
-#define kPartitionTypeNTFS "NTFS File System"
+#define kPartitionTypeNTFS "NT File System"
static const uint32 kDiskSystemFlags =
0
diff --git a/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c
b/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c
index d4128fc..d2835f3 100644
--- a/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c
+++ b/src/add-ons/kernel/file_systems/ntfs/kernel_interface.c
@@ -169,7 +169,7 @@ static file_system_module_info sNTFSFileSystem = {
},
"ntfs", // short_name
- "NTFS File System", // pretty_name
+ "NT File System", // pretty_name
B_DISK_SYSTEM_SUPPORTS_INITIALIZING
| B_DISK_SYSTEM_SUPPORTS_CONTENT_NAME
| B_DISK_SYSTEM_SUPPORTS_WRITING, // DDM flags
diff --git a/src/apps/drivesetup/MainWindow.cpp
b/src/apps/drivesetup/MainWindow.cpp
index 922c40d..c8ab45f 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -873,7 +873,7 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id
selectedPartition,
// TODO: diskSystem.IsFileSystem() seems like a better fit here?
if (diskSystemName == "Be File System"
- || diskSystemName == "NTFS File System") {
+ || diskSystemName == "NT File System") {
InitParamsPanel* panel = new InitParamsPanel(this,
diskSystemName,
partition);
if (panel->Go(name, parameters) == GO_CANCELED)
Other related posts:
- » [haiku-commits] haiku: hrev44790 - in src: add-ons/disk_systems/ntfs apps/drivesetup add-ons/kernel/file_systems/ntfs apps/showimage - Gerasim Troeglazov
