Remove unneccessary method FFuLabel::setLabelAlignment().

Simplify FFuLabel::setPixMap() to also set the scaling property.
Fix opening of URLs with https (in addition to http).

Author: kmoks

src/FFuLib/FFuLabel.H

@@ -20,10 +20,10 @@ public:
 
   // Methods to set what to show :
 
-  virtual void setPixMap(const char** pixmap, int width = 0, int height = 0) = 0;
+  virtual void setPixMap(const char** pixmap, bool stretch = false) = 0;
   virtual void setLabel(const char* label) = 0;
-  virtual void setLabel(const std::string& label) = 0;
-  virtual void setLabelAlignment(int align) = 0;
+
+  void setLabel(const std::string& label) { this->setLabel(label.c_str()); }
 
   // Get the text of the label :
 

src/FFuLib/FFuQtComponents/FFuQtLabel.C

@@ -20,18 +20,11 @@ FFuQtLabel::FFuQtLabel(QWidget* parent) : QLabel(parent)
 }
 
 
-void FFuQtLabel::setPixMap(const char** pixmap, int width, int height)
+void FFuQtLabel::setPixMap(const char** pixmap, bool stretch)
 {
   if (pixmap) {
-    QPixmap xpm(pixmap);
-    if (width > 0 && height > 0)
-      this->QLabel::setPixmap(xpm.scaled(width,height));
-    else if (width > 0)
-      this->QLabel::setPixmap(xpm.scaledToWidth(width));
-    else if (height > 0)
-      this->QLabel::setPixmap(xpm.scaledToHeight(height));
-    else
-      this->QLabel::setPixmap(xpm);
+    this->setScaledContents(stretch);
+    this->QLabel::setPixmap(QPixmap(pixmap));
   }
   else
     this->QLabel::clear();
@@ -43,21 +36,13 @@ void FFuQtLabel::setLabel(const char* label)
   this->setText(label);
 }
 
-void FFuQtLabel::setLabel(const std::string& label)
-{
-  this->setText(label.c_str());
-}
-
-void FFuQtLabel::setLabelAlignment(int alignment)
-{
-  this->setAlignment(static_cast<Qt::Alignment>(alignment));
-}
 
 std::string FFuQtLabel::getLabel() const
 {
   return this->text().toStdString();
 }
 
+
 void FFuQtLabel::fwdLinkActivated(const QString& txt)
 {
   myLinkActivatedCB.invoke(txt.toStdString());

src/FFuLib/FFuQtComponents/FFuQtLabel.H

@@ -23,10 +23,9 @@ public:
   FFuQtLabel(QWidget* parent = NULL);
   virtual ~FFuQtLabel() {}
 
-  virtual void setPixMap(const char** pixmap, int width = 0, int height = 0);
+  virtual void setPixMap(const char** pixmap, bool stretch);
   virtual void setLabel(const char* label);
-  virtual void setLabel(const std::string& label);
-  virtual void setLabelAlignment(int align);
+
   virtual std::string getLabel() const;
 
 public slots:

src/vpmUI/vpmUITopLevels/FuiAdvAnalysisOptions.C

@@ -406,8 +406,6 @@ void FuiAdvAnalysisOptions::initWidgets()
   this->autoCurveExportField->setFileOpenedCB(FFaDynCB2M(FuiAdvAnalysisOptions,this,
                                                          onAutoCurveExportFileChanged,const std::string&,int));
 
-  this->labels[OUTPUTOPTIONS][AUTO_CURVE_EXPORT]->setLabelAlignment(FFuaTextAlignment::AlignRight);
-
   this->toggleButtons[OUTPUTOPTIONS][AUTO_VTF_EXPORT]->setLabel("Automatic export to GLview VTF file");
   this->toggleButtons[OUTPUTOPTIONS][AUTO_VTF_EXPORT]->setToggleCB(FFaDynCB1M(FFuComponentBase,autoVTFField,
                                                                               setSensitivity,bool));

src/vpmUI/vpmUITopLevels/FuiObjectBrowser.C

@@ -37,8 +37,8 @@ FuiObjectBrowser::FuiObjectBrowser()
 
 void FuiObjectBrowser::initWidgets()
 {
-  this->headerImage1->setPixMap(objectBrowser1_xpm);
-  this->headerImage2->setPixMap(objectBrowser2_xpm);
+  this->headerImage1->setPixMap(objectBrowser1_xpm, false);
+  this->headerImage2->setPixMap(objectBrowser2_xpm, true);
 
   this->searchLabel->setLabel("Search and browse objects:");
 

src/vpmUI/vpmUITopLevels/vpmUIQtTopLevels/FuiQtAdvAnalysisOptions.C

@@ -215,7 +215,9 @@ FuiQtAdvAnalysisOptions::FuiQtAdvAnalysisOptions(QWidget* parent,
 
   // Output options
 #ifdef FT_HAS_SOLVERS
-  this->labels[OUTPUTOPTIONS][AUTO_CURVE_EXPORT]        = new FFuQtLabel(myOptions[OUTPUTOPTIONS]);
+  FFuQtLabel* qlab;
+  this->labels[OUTPUTOPTIONS][AUTO_CURVE_EXPORT] = qlab = new FFuQtLabel(myOptions[OUTPUTOPTIONS]);
+  qlab->setAlignment(Qt::AlignRight);
   this->toggleButtons[OUTPUTOPTIONS][AUTO_CURVE_EXPORT] = new FFuQtToggleButton(myOptions[OUTPUTOPTIONS]);
   this->toggleButtons[OUTPUTOPTIONS][AUTO_VTF_EXPORT]   = new FFuQtToggleButton(myOptions[OUTPUTOPTIONS]);
   this->toggleButtons[OUTPUTOPTIONS][AUTO_ANIM]         = new FFuQtToggleButton(myOptions[OUTPUTOPTIONS]);

src/vpmUI/vpmUITopLevels/vpmUIQtTopLevels/FuiQtObjectBrowser.C

@@ -45,7 +45,6 @@ FuiQtObjectBrowser::FuiQtObjectBrowser(int xpos, int ypos,
   this->helpButton      = new FFuQtPushButton(this);
   this->sepLabel        = new FFuQtLabel(this);
   this->copyDataButton  = new FFuQtPushButton(this);
-  ((FFuQtLabel*)headerImage2)->setScaledContents(true); // stretch the picture
 
   this->initWidgets();
 }

src/vpmUI/vpmUITopLevels/vpmUIQtTopLevels/FuiQtProperties.C

@@ -377,15 +377,14 @@ FuiQtProperties::FuiQtProperties(QWidget* parent,
   mySGLogoBorderTop = new FFuQtLabel(this);
   mySGLogoBorderRight = new FFuQtLabel(this);
   mySGFillWhite = new FFuQtLabel(this);
-  mySGContentLabel = new FFuQtLabel(this);
   mySGHeading = new FFuQtLabel(this);
   mySGBorderRight = new FFuQtLabel(this);
   mySGBorderBottom = new FFuQtLabel(this);
   mySGBorderTop = new FFuQtLabel(this);
-  ((FFuQtLabel*)mySGLogoImage)->setScaledContents(true); // stretch the picture
-  ((FFuQtLabel*)mySGLogoBorderRight)->setScaledContents(true); // stretch the picture
-  ((FFuQtLabel*)mySGBorderTop)->setScaledContents(true); // stretch the picture
-  ((FFuQtLabel*)mySGContentLabel)->setAlignment(Qt::AlignTop|Qt::AlignLeft); // set alignment
+
+  FFuQtLabel* qlab;
+  mySGContentLabel = qlab = new FFuQtLabel(this);
+  qlab->setAlignment(Qt::AlignTop|Qt::AlignLeft);
 
   // Parent class component initiation
 
@@ -454,7 +453,7 @@ static void onURLActivated(const std::string& url)
     FFaMsg::dialog("Invalid URL:\n" + url, FFaMsg::WARNING);
   else if (strUrl.left(7) == "file://")
     showPDFfile(strUrl);
-  else if (strUrl.left(7) == "http://")
+  else if (strUrl.left(8) == "https://" || strUrl.left(7) == "http://")
     if (!QDesktopServices::openUrl(objUrl))
       FFaMsg::dialog("Unable to open URL:\n" + url, FFaMsg::WARNING);
 }
@@ -506,25 +505,25 @@ bool FuiQtProperties::initStartGuide(FedemEdition edition)
   strData.replace(" src='", " src='" + appPath);
   // Set fields
   if (edition == Windpower) {
-    mySGLogoImage->setPixMap(startGuideLogoWP_xpm);
+    mySGLogoImage->setPixMap(startGuideLogoWP_xpm,true);
     mySGHeading->setLabel("<font color='#008cff' size='5'><i><b>Welcome to FEDEM Windpower 8.0</b></i></font>");
   }
   else if (edition == Offshore) {
-    mySGLogoImage->setPixMap(startGuideLogo_xpm);
+    mySGLogoImage->setPixMap(startGuideLogo_xpm,true);
     mySGHeading->setLabel("<font color='#008cff' size='5'><i><b>Welcome to FEDEM Offshore 8.0</b></i></font>");
   }
   else {
-    mySGLogoImage->setPixMap(startGuideLogo_xpm);
+    mySGLogoImage->setPixMap(startGuideLogo_xpm,true);
     mySGHeading->setLabel("<font color='#008cff' size='5'><i><b>Welcome to FEDEM 8.0</b></i></font>");
   }
   mySGContentLabel->setLabel(strData);
   mySGContentLabel->setLinkActivatedCB(FFaDynCB1S(onURLActivated,const std::string&));
-  mySGLogoBorderRight->setPixMap(startGuideBorderRight_xpm);
+  mySGLogoBorderRight->setPixMap(startGuideBorderRight_xpm,true);
   FFuaPalette pal;
   pal.setStdBackground(255,255,255);
   mySGFillWhite->setColors(pal);
   mySGContentLabel->setColors(pal);
-  mySGBorderTop->setPixMap(startGuideBorderTop_xpm);
+  mySGBorderTop->setPixMap(startGuideBorderTop_xpm,true);
   pal.setStdBackground(130,135,144);
   mySGBorderRight->setColors(pal);
   mySGBorderBottom->setColors(pal);