sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed the activate button in style settings. selected item in the

Browse Source 
lists will be activated automatically
This commit is contained in:
doitux
2009-05-30 21:06:03 +00:00
parent 56130328e4
commit a0d5cde591
2 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/settingsdialog.ui
+19 -35
View File
@@ -125,7 +125,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="page">
<layout class="QGridLayout" name="gridLayout_8">
@@ -309,9 +309,16 @@
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="pushButton_activateGameTableStyle">
<widget class="QPushButton" name="pushButton_addGameTableStyle">
<property name="text">
<string>Activate</string>
<string>Add ...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_removeGameTableStyle">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
@@ -328,20 +335,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_addGameTableStyle">
<property name="text">
<string>Add ...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_removeGameTableStyle">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
@@ -412,9 +405,16 @@ p, li { white-space: pre-wrap; }
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="pushButton_activateCardDeckStyle">
<widget class="QPushButton" name="pushButton_addCardDeckStyle">
<property name="text">
<string>Activate</string>
<string>Add ...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_removeCardDeckStyle">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
@@ -431,20 +431,6 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_addCardDeckStyle">
<property name="text">
<string>Add ...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_removeCardDeckStyle">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
@@ -3457,11 +3443,9 @@ p, li { white-space: pre-wrap; }
<tabstop>checkBox_enableBetInputFocusSwitch</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>listWidget_gameTableStyles</tabstop>
<tabstop>pushButton_activateGameTableStyle</tabstop>
<tabstop>pushButton_addGameTableStyle</tabstop>
<tabstop>pushButton_removeGameTableStyle</tabstop>
<tabstop>listWidget_cardDeckStyles</tabstop>
<tabstop>pushButton_activateCardDeckStyle</tabstop>
<tabstop>pushButton_addCardDeckStyle</tabstop>
<tabstop>pushButton_removeCardDeckStyle</tabstop>
<tabstop>groupBox_playSoundEffects</tabstop>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+15 -13
View File
@@ -109,12 +109,10 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
connect(groupBox_manualServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxManualServerConfig(bool)));
connect( listWidget_gameTableStyles, SIGNAL( currentItemChanged(QListWidgetItem*, QListWidgetItem*) ), this, SLOT ( showCurrentGameTableStylePreview() ));
connect( pushButton_activateGameTableStyle, SIGNAL( clicked() ), this, SLOT( setSelectedGameTableStyleActivated()) );
connect( pushButton_addGameTableStyle, SIGNAL( clicked() ), this, SLOT( addGameTableStyle()) );
connect( pushButton_removeGameTableStyle, SIGNAL( clicked() ), this, SLOT( removeGameTableStyle()) );
connect( listWidget_cardDeckStyles, SIGNAL( currentItemChanged(QListWidgetItem*, QListWidgetItem*) ), this, SLOT ( showCurrentCardDeckStylePreview() ));
connect( pushButton_activateCardDeckStyle, SIGNAL( clicked() ), this, SLOT( setSelectedCardDeckStyleActivated()) );
connect( pushButton_addCardDeckStyle, SIGNAL( clicked() ), this, SLOT( addCardDeckStyle()) );
connect( pushButton_removeCardDeckStyle, SIGNAL( clicked() ), this, SLOT( removeCardDeckStyle()) );
}
@@ -924,6 +922,9 @@ void settingsDialogImpl::showCurrentGameTableStylePreview()
}
label_gameTableStyleInfo->setText("<b>"+MaintainerName+":</b> "+style.getStyleMaintainerName()+"<br>"+maintainerEMailString+"<b>"+CreateDate+":</b> "+style.getStyleCreateDate()+"<br>"+windowsSubString);
//active the current selected item directly
setSelectedGameTableStyleActivated();
}
}
@@ -978,7 +979,6 @@ void settingsDialogImpl::addGameTableStyle()
newItem->setData(Qt::ToolTipRole,fileName);
listWidget_gameTableStyles->addItem(newItem);
listWidget_gameTableStyles->setCurrentItem(newItem);
pushButton_activateGameTableStyle->click();
}
else {
QMessageBox::warning(this, tr("Game Table Style File Error"),
@@ -1013,22 +1013,25 @@ void settingsDialogImpl::showCurrentCardDeckStylePreview()
{
QListWidgetItem* item = listWidget_cardDeckStyles->currentItem();
if(item) {
CardDeckStyleReader style(myConfig, this);
CardDeckStyleReader style(myConfig, this);
style.readStyleFile(item->data(15).toString());
QPixmap preview(style.getPreview());
if(preview.height() > 160 || preview.width() > 120) label_cardDeckStylePreview->setPixmap(preview.scaled(160,120,Qt::KeepAspectRatio,Qt::SmoothTransformation));
else label_cardDeckStylePreview->setPixmap(preview);
QString MaintainerName = tr("Maintainer Name");
QString MaintainerEMail = tr("Maintainer EMail");
QString CreateDate = tr("Create Date");
QString maintainerEMailString;
if(style.getStyleMaintainerEMail() != "NULL" && style.getStyleMaintainerEMail() != "") {
maintainerEMailString = "<b>"+MaintainerEMail+":</b> "+style.getStyleMaintainerEMail()+"<br>";
}
label_cardDeckStyleInfo->setText("<b>"+MaintainerName+":</b> "+style.getStyleMaintainerName()+"<br>"+maintainerEMailString+"<b>"+CreateDate+":</b> "+style.getStyleCreateDate()+"");
QString maintainerEMailString;
if(style.getStyleMaintainerEMail() != "NULL" && style.getStyleMaintainerEMail() != "") {
maintainerEMailString = "<b>"+MaintainerEMail+":</b> "+style.getStyleMaintainerEMail()+"<br>";
}
label_cardDeckStyleInfo->setText("<b>"+MaintainerName+":</b> "+style.getStyleMaintainerName()+"<br>"+maintainerEMailString+"<b>"+CreateDate+":</b> "+style.getStyleCreateDate()+"");
//active the current selected item directly
setSelectedCardDeckStyleActivated();
}
}
@@ -1083,7 +1086,6 @@ void settingsDialogImpl::addCardDeckStyle()
newItem->setData(Qt::ToolTipRole,fileName);
listWidget_cardDeckStyles->addItem(newItem);
listWidget_cardDeckStyles->setCurrentItem(newItem);
pushButton_activateCardDeckStyle->click();
}
else {
QMessageBox::warning(this, tr("Card Deck Style File Error"),