151 mapPreview->setFixedSize(256 + 6, 128 + 6); |
151 mapPreview->setFixedSize(256 + 6, 128 + 6); |
152 mapPreview->setContentsMargins(0, 0, 0, 0); |
152 mapPreview->setContentsMargins(0, 0, 0, 0); |
153 leftLayout->addWidget(mapPreview, 0); |
153 leftLayout->addWidget(mapPreview, 0); |
154 connect(mapPreview, SIGNAL(clicked()), this, SLOT(previewClicked())); |
154 connect(mapPreview, SIGNAL(clicked()), this, SLOT(previewClicked())); |
155 |
155 |
156 mapFeatureSize = new QSlider(Qt::Horizontal, this); |
|
157 mapFeatureSize->setObjectName("mapFeatureSize"); |
|
158 //mapFeatureSize->setTickPosition(QSlider::TicksBelow); |
|
159 mapFeatureSize->setMaximum(100); |
|
160 mapFeatureSize->setMinimum(1); |
|
161 mapFeatureSize->setFixedWidth(259); |
|
162 mapFeatureSize->setValue(50); |
|
163 leftLayout->addWidget(mapFeatureSize, 0); |
|
164 |
|
165 /* Bottom-Left layout */ |
156 /* Bottom-Left layout */ |
166 |
157 |
167 QVBoxLayout * bottomLeftLayout = new QVBoxLayout(); |
158 QVBoxLayout * bottomLeftLayout = new QVBoxLayout(); |
168 leftLayout->addLayout(bottomLeftLayout, 1); |
159 leftLayout->addLayout(bottomLeftLayout, 1); |
169 |
160 |
228 new QListWidgetItem(tr("Large islands"), mazeStyles); |
219 new QListWidgetItem(tr("Large islands"), mazeStyles); |
229 connect(mazeStyles, SIGNAL(currentRowChanged(int)), this, SLOT(setMazeSize(int))); |
220 connect(mazeStyles, SIGNAL(currentRowChanged(int)), this, SLOT(setMazeSize(int))); |
230 m_childWidgets << mazeStyles; |
221 m_childWidgets << mazeStyles; |
231 rightLayout->addWidget(mazeStyles, 1); |
222 rightLayout->addWidget(mazeStyles, 1); |
232 |
223 |
|
224 mapFeatureSize = new QSlider(Qt::Horizontal, this); |
|
225 mapFeatureSize->setObjectName("mapFeatureSize"); |
|
226 //mapFeatureSize->setTickPosition(QSlider::TicksBelow); |
|
227 mapFeatureSize->setMaximum(100); |
|
228 mapFeatureSize->setMinimum(1); |
|
229 //mapFeatureSize->setFixedWidth(259); |
|
230 mapFeatureSize->setValue(50); |
|
231 mapFeatureSize->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
232 bottomLeftLayout->addWidget(mapFeatureSize, 0); |
|
233 connect(mapFeatureSize, SIGNAL(valueChanged(int)), this, SLOT(mapFeatureSizeChanged(int))); |
|
234 |
233 /* Mission description */ |
235 /* Mission description */ |
234 |
236 |
235 lblDesc = new QLabel(); |
237 lblDesc = new QLabel(); |
236 lblDesc->setWordWrap(true); |
238 lblDesc->setWordWrap(true); |
237 lblDesc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
239 lblDesc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
245 |
247 |
246 /* Theme chooser */ |
248 /* Theme chooser */ |
247 |
249 |
248 btnTheme = new QPushButton(this); |
250 btnTheme = new QPushButton(this); |
249 btnTheme->setFlat(true); |
251 btnTheme->setFlat(true); |
|
252 btnTheme->setIconSize(QSize(30, 30)); |
|
253 btnTheme->setFixedHeight(30); |
250 connect(btnTheme, SIGNAL(clicked()), this, SLOT(showThemePrompt())); |
254 connect(btnTheme, SIGNAL(clicked()), this, SLOT(showThemePrompt())); |
251 m_childWidgets << btnTheme; |
255 m_childWidgets << btnTheme; |
252 bottomLeftLayout->addWidget(btnTheme, 0); |
256 bottomLeftLayout->addWidget(btnTheme, 0); |
253 |
257 |
254 /* Add everything to main layout */ |
258 /* Add everything to main layout */ |
768 mapgen = MAPGEN_MAP; |
773 mapgen = MAPGEN_MAP; |
769 missionMapChanged(newMap.isValid() ? newMap : missionMapList->currentIndex()); |
774 missionMapChanged(newMap.isValid() ? newMap : missionMapList->currentIndex()); |
770 lblMapList->setText(tr("Mission:")); |
775 lblMapList->setText(tr("Mission:")); |
771 lblMapList->show(); |
776 lblMapList->show(); |
772 missionMapList->show(); |
777 missionMapList->show(); |
|
778 mapFeatureSize->hide(); |
773 lblDesc->setText(m_mapInfo.desc); |
779 lblDesc->setText(m_mapInfo.desc); |
774 lblDesc->show(); |
780 lblDesc->show(); |
775 emit mapChanged(m_curMap); |
781 emit mapChanged(m_curMap); |
776 break; |
782 break; |
777 case MapModel::StaticMap: |
783 case MapModel::StaticMap: |
786 default: |
792 default: |
787 break; |
793 break; |
788 } |
794 } |
789 |
795 |
790 // Update theme button size |
796 // Update theme button size |
791 updateThemeButtonSize(); |
797 // updateThemeButtonSize(); |
792 |
798 |
793 // Update cType combobox |
799 // Update cType combobox |
794 for (int i = 0; i < cType->count(); i++) |
800 for (int i = 0; i < cType->count(); i++) |
795 { |
801 { |
796 if ((MapModel::MapType)cType->itemData(i).toInt() == type) |
802 if ((MapModel::MapType)cType->itemData(i).toInt() == type) |
803 repaint(); |
809 repaint(); |
804 |
810 |
805 emit mapgenChanged(mapgen); |
811 emit mapgenChanged(mapgen); |
806 } |
812 } |
807 |
813 |
|
814 void HWMapContainer::mapFeatureSizeChanged(int index) |
|
815 { |
|
816 } |
|
817 |
|
818 // unused because I needed the space for the slider |
808 void HWMapContainer::updateThemeButtonSize() |
819 void HWMapContainer::updateThemeButtonSize() |
809 { |
820 { |
810 if (m_mapInfo.type == MapModel::MissionMap) |
821 if (m_mapInfo.type == MapModel::MissionMap) |
811 { |
822 { |
812 btnTheme->setIconSize(QSize(30, 30)); |
823 btnTheme->setIconSize(QSize(30, 30)); |
836 void HWMapContainer::updateTheme(const QModelIndex & current) |
847 void HWMapContainer::updateTheme(const QModelIndex & current) |
837 { |
848 { |
838 m_theme = selectedTheme = current.data(ThemeModel::ActualNameRole).toString(); |
849 m_theme = selectedTheme = current.data(ThemeModel::ActualNameRole).toString(); |
839 m_themeID = current.row(); |
850 m_themeID = current.row(); |
840 QIcon icon = qVariantValue<QIcon>(current.data(Qt::DecorationRole)); |
851 QIcon icon = qVariantValue<QIcon>(current.data(Qt::DecorationRole)); |
841 QSize iconSize = icon.actualSize(QSize(65535, 65535)); |
852 //QSize iconSize = icon.actualSize(QSize(65535, 65535)); |
842 btnTheme->setFixedHeight(64); |
853 //btnTheme->setFixedHeight(64); |
843 btnTheme->setIconSize(iconSize); |
854 //btnTheme->setIconSize(iconSize); |
844 btnTheme->setIcon(icon); |
855 btnTheme->setIcon(icon); |
845 btnTheme->setText(tr("Theme: %1").arg(current.data(Qt::DisplayRole).toString())); |
856 btnTheme->setText(tr("Theme: %1").arg(current.data(Qt::DisplayRole).toString())); |
846 updateThemeButtonSize(); |
857 // updateThemeButtonSize(); |
847 } |
858 } |
848 |
859 |
849 void HWMapContainer::staticMapChanged(const QModelIndex & map, const QModelIndex & old) |
860 void HWMapContainer::staticMapChanged(const QModelIndex & map, const QModelIndex & old) |
850 { |
861 { |
851 mapChanged(map, 0, old); |
862 mapChanged(map, 0, old); |