Ticket #7991: DriveSetup-SizeTextControl-20110918.diff

Support.cpp

@@ -99 +99 @@
     BSlider(name, label, message, minValue, maxValue,
     B_HORIZONTAL, B_TRIANGLE_THUMB),
     fStartOffset(minValue),
-    fEndOffset(maxValue)
+    fEndOffset(maxValue),
+    fMaxPartitionSize(maxValue)
 {
     SetBarColor((rgb_color){ 0, 80, 255, 255 });
     char minString[64];
@@ -143 +144 @@
     // headed slider is implemented.
     return fStartOffset;
 }
+
+int32
+SizeSlider::MaxPartitionSize()
+{
+    return fMaxPartitionSize;
+}

Support.h

@@ -51 +51 @@
     virtual const char*         UpdateText() const;
             int32               Size();
             int32               Offset();
+            int32               MaxPartitionSize();
 
 private:
             off_t               fStartOffset;
             off_t               fEndOffset;
+            off_t               fMaxPartitionSize;
     mutable char                fStatusLabel[64];
 };
 

CreateParamsPanel.cpp

@@ -77 +77 @@
 enum {
     MSG_OK                      = 'okok',
     MSG_CANCEL                  = 'cncl',
-    MSG_PARTITION_TYPE          = 'type'
+    MSG_PARTITION_TYPE          = 'type',
+    MSG_SIZE_SLIDER             = 'ssld',
+    MSG_SIZE_TEXTCONTROL        = 'stct'
 };
 
 
@@ -138 +140 @@
                 fEditor->PartitionTypeChanged(type);
             }
             break;
+        
+        case MSG_SIZE_SLIDER:
+        {
+            BString sizeString;
+            sizeString << fSizeSlider->Value();
+            fSizeTextControl->SetText(sizeString.String());
+            break;
+        }
+            
+        case MSG_SIZE_TEXTCONTROL:
+        {
+            BString sizeString;
+            sizeString = fSizeTextControl->Text();
+            int32 sizeInt = atoi(sizeString.String());
+            if (sizeInt >= 0 && sizeInt <= fSizeSlider->MaxPartitionSize())
+                fSizeSlider->SetValue(sizeInt);
+            else {
+                int32 sizeTextControlLength = fSizeTextControl->TextView()->TextLength();
+                fSizeTextControl->TextView()->Delete(sizeTextControlLength - 1, sizeTextControlLength);
+            }
+            break;
+        }
 
         default:
             BWindow::MessageReceived(message);
@@ -225 +249 @@
     fSizeSlider = new SizeSlider("Slider", B_TRANSLATE("Partition size"), NULL,
         offset, offset + size);
     fSizeSlider->SetPosition(1.0);
+    fSizeSlider->SetModificationMessage(new BMessage(MSG_SIZE_SLIDER));
+    
+    BString sizeText;
+    sizeText << fSizeSlider->Value();
+    fSizeTextControl = new BTextControl("Size Control",
+        "", sizeText.String(), NULL);
+    for(int32 i = 0; i < 256; i++)
+        fSizeTextControl->TextView()->DisallowChar(i);
+    for(int32 i = '0'; i <= '9'; i++)
+        fSizeTextControl->TextView()->AllowChar(i);
+    fSizeTextControl->SetModificationMessage(new BMessage(MSG_SIZE_TEXTCONTROL));
 
     fNameTextControl = new BTextControl("Name Control",
         B_TRANSLATE("Partition name:"), "", NULL);
@@ -257 +292 @@
 
     AddChild(BGroupLayoutBuilder(B_VERTICAL, spacing)
         .Add(fSizeSlider)
+        .Add(fSizeTextControl)
         .Add(BGridLayoutBuilder(0.0, 5.0)
             .Add(fNameTextControl->CreateLabelLayoutItem(), 0, 0)
             .Add(fNameTextControl->CreateTextViewLayoutItem(), 1, 0)

CreateParamsPanel.h

@@ -50 +50 @@
             BMenuField*         fTypeMenuField;
             BTextControl*       fNameTextControl;
             SizeSlider*         fSizeSlider;
+            BTextControl*       fSizeTextControl;
 };
 
 #endif // CREATE_PARAMS_PANEL_H