diff -Nru blackchocobo-1.9.831/debian/bzr-builder.manifest blackchocobo-1.9.831/debian/bzr-builder.manifest --- blackchocobo-1.9.831/debian/bzr-builder.manifest 2015-06-30 07:47:00.000000000 +0000 +++ blackchocobo-1.9.831/debian/bzr-builder.manifest 2015-07-01 07:46:48.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~1200 -lp:~sithlord48/blackchocobo/trunk revid:git-v1:71385853aee9f5aaf617b59666b8b4c326ac4de9 +# bzr-builder format 0.3 deb-version {debupstream}-0~1201 +lp:~sithlord48/blackchocobo/trunk revid:git-v1:8dd23f8aafa36f3bc6ac829f553b05565fad3e24 diff -Nru blackchocobo-1.9.831/debian/changelog blackchocobo-1.9.831/debian/changelog --- blackchocobo-1.9.831/debian/changelog 2015-06-30 07:47:00.000000000 +0000 +++ blackchocobo-1.9.831/debian/changelog 2015-07-01 07:46:48.000000000 +0000 @@ -1,8 +1,8 @@ -blackchocobo (1.9.831-0~1200~ubuntu14.10.1) utopic; urgency=low +blackchocobo (1.9.831-0~1201~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- sithlord48 Tue, 30 Jun 2015 07:47:00 +0000 + -- sithlord48 Wed, 01 Jul 2015 07:46:48 +0000 blackchocobo (1.9.831) trusty; urgency=low *build from git hub diff -Nru blackchocobo-1.9.831/ff7tk/widgets/DoubleCheckBox.cpp blackchocobo-1.9.831/ff7tk/widgets/DoubleCheckBox.cpp --- blackchocobo-1.9.831/ff7tk/widgets/DoubleCheckBox.cpp 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/DoubleCheckBox.cpp 2015-07-01 07:46:46.000000000 +0000 @@ -30,11 +30,13 @@ } void DoubleCheckBox::init_display() { + qreal scaleX = qApp->desktop()->logicalDpiX()/96; + qreal scaleY = qApp->desktop()->logicalDpiY()/96; cb_one = new QCheckBox; cb_two = new QCheckBox; label = new QLabel; - cb_one->setMaximumSize(22,22); - cb_two->setMaximumSize(22,22); + cb_one->setMaximumSize(22*scaleX,22*scaleY); + cb_two->setMaximumSize(22*scaleX,22*scaleY); QHBoxLayout *boxLayout = new QHBoxLayout; boxLayout->addWidget(cb_one); boxLayout->addWidget(cb_two); diff -Nru blackchocobo-1.9.831/ff7tk/widgets/ItemList.cpp blackchocobo-1.9.831/ff7tk/widgets/ItemList.cpp --- blackchocobo-1.9.831/ff7tk/widgets/ItemList.cpp 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/ItemList.cpp 2015-07-01 07:46:46.000000000 +0000 @@ -150,7 +150,7 @@ setItem(sender()->objectName().toInt(),0,newItem); newItem = new QTableWidgetItem(tr("-------EMPTY--------"),0); setItem(sender()->objectName().toInt(),1,newItem); - setRowHeight(sender()->objectName().toInt(),22); + setRowHeight(sender()->objectName().toInt(),font().pointSize()*3+2); newItem = new QTableWidgetItem("",0); setItem(sender()->objectName().toInt(),2,newItem); } @@ -238,7 +238,6 @@ setItem(row,0,newItem); newItem = new QTableWidgetItem(tr("-------EMPTY--------"),0); setItem(row,1,newItem); - //setRowHeight(row,22); newItem = new QTableWidgetItem("",0); setItem(row,2,newItem); } @@ -248,7 +247,6 @@ setItem(row,0,newItem); newItem = new QTableWidgetItem(tr("-------BAD ID-------"),0); setItem(row,1,newItem); - //setRowHeight(row,22); newItem = new QTableWidgetItem("",0); setItem(row,2,newItem); } @@ -260,9 +258,9 @@ setItem(row,0,newItem); newItem = new QTableWidgetItem(Items.name(Items.itemId(itemlist.at(row))),0); setItem(row,1, newItem); - //setRowHeight(row,22); newItem = new QTableWidgetItem(qty.setNum(Items.itemQty(itemlist.at(row))),0); setItem(row,2,newItem); } + setRowHeight(row,font().pointSize()*3+2); } void ItemList::setEditableItemCombo(bool editable){editableItemCombo=editable;} diff -Nru blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.cpp blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.cpp --- blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.cpp 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.cpp 2015-07-01 07:46:46.000000000 +0000 @@ -25,6 +25,8 @@ ItemPreview::ItemPreview(QWidget *parent,QFlags WindowFlags) :QWidget(parent) { setWindowFlags(WindowFlags); + scaleX = qApp->desktop()->logicalDpiX()/96; + scaleY = qApp->desktop()->logicalDpiY()/96; Qt::WindowFlags WidgetType =(this->windowFlags() & Qt::WindowType_Mask); if(WidgetType ==Qt::Popup || WidgetType ==Qt::ToolTip) @@ -35,20 +37,20 @@ lbl_name=new QLabel(); lbl_desc=new QLabel(); lbl_icon=new QLabel(); - lbl_icon->setFixedSize(24,24); + lbl_icon->setFixedSize(24*scaleX,24*scaleY); lbl_icon->setScaledContents(1); QSpacerItem *spacer=new QSpacerItem(-1,-1,QSizePolicy::Expanding,QSizePolicy::Minimum); lbl_slot_1= new QLabel(); - lbl_slot_1->setFixedSize(24,24); + lbl_slot_1->setFixedSize(24*scaleX,24*scaleY); lbl_slot_1->setScaledContents(1); lbl_slot_1->setHidden(true); lbl_m_link_1= new QLabel(); - lbl_m_link_1->setFixedSize(12,24); + lbl_m_link_1->setFixedSize(12*scaleX,24*scaleY); lbl_m_link_1->setScaledContents(1); lbl_slot_2 = new QLabel(); - lbl_slot_2->setFixedSize(24,24); + lbl_slot_2->setFixedSize(24*scaleX,24*scaleY); lbl_slot_2->setScaledContents(1); lbl_slot_2->setHidden(true); @@ -60,16 +62,16 @@ slots_1_and_2->setSpacing(0); lbl_slot_3 = new QLabel(); - lbl_slot_3->setFixedSize(24,24); + lbl_slot_3->setFixedSize(24*scaleX,24*scaleY); lbl_slot_3->setScaledContents(1); lbl_slot_3->setHidden(true); lbl_m_link_2 = new QLabel(); - lbl_m_link_2->setFixedSize(12,24); + lbl_m_link_2->setFixedSize(12*scaleX,24*scaleY); lbl_m_link_2->setScaledContents(1); lbl_slot_4 = new QLabel(); - lbl_slot_4->setFixedSize(24,24); + lbl_slot_4->setFixedSize(24*scaleX,24*scaleY); lbl_slot_4->setScaledContents(1); lbl_slot_4->setHidden(true); @@ -81,16 +83,16 @@ slots_3_and_4->setSpacing(0); lbl_slot_5 = new QLabel(); - lbl_slot_5->setFixedSize(24,24); + lbl_slot_5->setFixedSize(24*scaleX,24*scaleY); lbl_slot_5->setScaledContents(1); lbl_slot_5->setHidden(true); lbl_m_link_3 = new QLabel(); - lbl_m_link_3->setFixedSize(12,24); + lbl_m_link_3->setFixedSize(12*scaleX,24*scaleY); lbl_m_link_3->setScaledContents(1); lbl_slot_6 = new QLabel(); - lbl_slot_6->setFixedSize(24,24); + lbl_slot_6->setFixedSize(24*scaleX,24*scaleY); lbl_slot_6->setScaledContents(1); lbl_slot_6->setHidden(true); @@ -102,16 +104,16 @@ slots_5_and_6->setSpacing(0); lbl_slot_7 = new QLabel(); - lbl_slot_7->setFixedSize(24,24); + lbl_slot_7->setFixedSize(24*scaleX,24*scaleY); lbl_slot_7->setScaledContents(1); lbl_slot_7->setHidden(true); lbl_m_link_4 = new QLabel(); - lbl_m_link_4->setFixedSize(12,24); + lbl_m_link_4->setFixedSize(12*scaleX,24*scaleY); lbl_m_link_4->setScaledContents(1); lbl_slot_8 = new QLabel(); - lbl_slot_8->setFixedSize(24,24); + lbl_slot_8->setFixedSize(24*scaleX,24*scaleY); lbl_slot_8->setScaledContents(1); lbl_slot_8->setHidden(true); @@ -124,7 +126,7 @@ materia_slot_box = new QGroupBox(); materia_slot_box->setContentsMargins(0,0,0,0); - materia_slot_box->setFixedSize(320,48); + materia_slot_box->setFixedSize(320*scaleX,48*scaleY); QHBoxLayout *materia_slots = new QHBoxLayout(); materia_slots->setContentsMargins(0,0,0,0); @@ -242,25 +244,25 @@ { if(data.materiaGrowthRate(id)==0) {//no growth slots - lbl_slot_1->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); - lbl_slot_2->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); - lbl_slot_3->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); - lbl_slot_4->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); - lbl_slot_5->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); - lbl_slot_6->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); - lbl_slot_7->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); - lbl_slot_8->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth())); + lbl_slot_1->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_1->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_2->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_2->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_3->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_3->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_4->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_4->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_5->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_5->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_6->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_6->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_7->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_7->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_8->setPixmap(QPixmap::fromImage(data.imageMateriaSlotNoGrowth()).scaled(lbl_slot_8->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); } else {//growth slots. - lbl_slot_1->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); - lbl_slot_2->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); - lbl_slot_3->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); - lbl_slot_4->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); - lbl_slot_5->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); - lbl_slot_6->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); - lbl_slot_7->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); - lbl_slot_8->setPixmap(QPixmap::fromImage(data.imageMateriaSlot())); + lbl_slot_1->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_1->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_2->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_2->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_3->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_3->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_4->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_4->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_5->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_5->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_6->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_6->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_7->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_7->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + lbl_slot_8->setPixmap(QPixmap::fromImage(data.imageMateriaSlot()).scaled(lbl_slot_8->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); } QString ap_rate =tr("APx%1").arg(data.materiaGrowthRate(id)); materia_slot_box->setTitle(ap_rate); @@ -280,10 +282,10 @@ switch(data.linkedSlots(id)) { - case 4: lbl_m_link_4->setPixmap(QPixmap::fromImage(data.imageMateriaLink())); - case 3: lbl_m_link_3->setPixmap(QPixmap::fromImage(data.imageMateriaLink())); - case 2: lbl_m_link_2->setPixmap(QPixmap::fromImage(data.imageMateriaLink())); - case 1: lbl_m_link_1->setPixmap(QPixmap::fromImage(data.imageMateriaLink())); + case 4: lbl_m_link_4->setPixmap(QPixmap::fromImage(data.imageMateriaLink()).scaled(lbl_m_link_4->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + case 3: lbl_m_link_3->setPixmap(QPixmap::fromImage(data.imageMateriaLink()).scaled(lbl_m_link_3->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + case 2: lbl_m_link_2->setPixmap(QPixmap::fromImage(data.imageMateriaLink()).scaled(lbl_m_link_2->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); + case 1: lbl_m_link_1->setPixmap(QPixmap::fromImage(data.imageMateriaLink()).scaled(lbl_m_link_1->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); }; } } @@ -339,14 +341,14 @@ if(elemental_effects->count() <6) { //elemental_effects->setFixedHeight(y); - elemental_box->setFixedSize(160,elemental_effects->height()+elemental_box->contentsMargins().top()+elemental_box->contentsMargins().bottom()); + elemental_box->setFixedSize(160*scaleX,elemental_effects->height()+elemental_box->contentsMargins().top()+elemental_box->contentsMargins().bottom()); //elemental_box->setFixedSize(160,y+elemental_box->contentsMargins().top()+elemental_box->contentsMargins().bottom()); } - else{elemental_box->setFixedSize(160,elemental_effects->sizeHintForRow(0)*5 +elemental_box->contentsMargins().top()+elemental_box->contentsMargins().bottom());} + else{elemental_box->setFixedSize(160*scaleX,elemental_effects->sizeHintForRow(0)*5 +elemental_box->contentsMargins().top()+elemental_box->contentsMargins().bottom());} } else { - elemental_box->setFixedSize(160,y + elemental_box->contentsMargins().top() +elemental_box->contentsMargins().bottom()); + elemental_box->setFixedSize(160*scaleX,y + elemental_box->contentsMargins().top() +elemental_box->contentsMargins().bottom()); }}//end of else elemental_box->setVisible(show); elemental_box->adjustSize(); @@ -410,11 +412,11 @@ {//make the combo box smaller if not a popup or tooltip if(status_effects->count()<6) { - status_box->setFixedSize(160,y+status_box->contentsMargins().top()+status_box->contentsMargins().bottom()); + status_box->setFixedSize(160*scaleX,y+status_box->contentsMargins().top()+status_box->contentsMargins().bottom()); } - else{status_box->setFixedSize(160,status_effects->sizeHintForRow(0)*5 +status_box->contentsMargins().top()+status_box->contentsMargins().bottom());} + else{status_box->setFixedSize(160*scaleX,status_effects->sizeHintForRow(0)*5 +status_box->contentsMargins().top()+status_box->contentsMargins().bottom());} } - else{status_box->setFixedSize(160,y+status_box->contentsMargins().top()+status_box->contentsMargins().bottom());} + else{status_box->setFixedSize(160*scaleX,y+status_box->contentsMargins().top()+status_box->contentsMargins().bottom());} }//end of else status_box->setVisible(show); status_box->adjustSize(); diff -Nru blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.h blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.h --- blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.h 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/ItemPreview.h 2015-07-01 07:46:46.000000000 +0000 @@ -65,5 +65,7 @@ QListWidget *status_effects; FF7Item data; int _id; + qreal scaleX; + qreal scaleY; }; #endif//ITEMPREVIEW_H diff -Nru blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.cpp blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.cpp --- blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.cpp 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.cpp 2015-07-01 07:46:46.000000000 +0000 @@ -17,6 +17,7 @@ ItemSelector::ItemSelector(QWidget *parent): QWidget(parent) { + Items = new FF7Item; init_display(); init_connections(); } @@ -37,7 +38,7 @@ btn_remove->setIcon(QIcon::fromTheme(QString("edit-clear"),QPixmap(":/common/edit-clear"))); btn_remove->setToolTip(tr("Empty Item")); - btn_remove->setFixedSize(22,22); + btn_remove->setFixedSize(22*qApp->desktop()->logicalDpiX()/96,font().pointSize()*3+2); btn_remove->setShortcut(QKeySequence::Delete); init_data(); //before setting layout set dat QHBoxLayout *layout = new QHBoxLayout; @@ -61,21 +62,21 @@ } void ItemSelector::init_data() { - combo_type->addItem(Items.icon(FF7Item::Potion),tr("")); - combo_type->addItem(Items.icon(FF7Item::BronzeBangle),tr("")); - combo_type->addItem(Items.icon(FF7Item::Ribbon),tr("")); - combo_type->addItem(Items.icon(FF7Item::BusterSword),tr("")); - combo_type->addItem(Items.icon(FF7Item::GatlingGun),tr("")); - combo_type->addItem(Items.icon(FF7Item::GodsHand),tr("")); - combo_type->addItem(Items.icon(FF7Item::AdamanClip),tr("")); - combo_type->addItem(Items.icon(FF7Item::StrikingStaff),tr("")); - combo_type->addItem(Items.icon(FF7Item::Mop),tr("")); - combo_type->addItem(Items.icon(FF7Item::FourPointShuriken),tr("")); - combo_type->addItem(Items.icon(FF7Item::CrystalMphone),tr("")); - combo_type->addItem(Items.icon(FF7Item::SupershotST),tr("")); + combo_type->addItem(Items->icon(FF7Item::Potion),tr("")); + combo_type->addItem(Items->icon(FF7Item::BronzeBangle),tr("")); + combo_type->addItem(Items->icon(FF7Item::Ribbon),tr("")); + combo_type->addItem(Items->icon(FF7Item::BusterSword),tr("")); + combo_type->addItem(Items->icon(FF7Item::GatlingGun),tr("")); + combo_type->addItem(Items->icon(FF7Item::GodsHand),tr("")); + combo_type->addItem(Items->icon(FF7Item::AdamanClip),tr("")); + combo_type->addItem(Items->icon(FF7Item::StrikingStaff),tr("")); + combo_type->addItem(Items->icon(FF7Item::Mop),tr("")); + combo_type->addItem(Items->icon(FF7Item::FourPointShuriken),tr("")); + combo_type->addItem(Items->icon(FF7Item::CrystalMphone),tr("")); + combo_type->addItem(Items->icon(FF7Item::SupershotST),tr("")); sb_qty->setEnabled(false); //Fill Combo_Item (all items type is 0 or no filter defalut) - for(int i=0;i<320;i++){combo_item->addItem(Items.icon(i),Items.name(i));} + for(int i=0;i<320;i++){combo_item->addItem(Items->icon(i),Items->name(i));} combo_type->setCurrentIndex(-1); combo_item->setCurrentIndex(-1); current_item=FF7Item::EmptyItemData; @@ -93,17 +94,17 @@ void ItemSelector::setFilter(int type) { type++;//for hiding no filter. - int id = Items.itemId(current_item); + int id = Items->itemId(current_item); combo_item->blockSignals(true); combo_item->clear(); for(int i=0;i<320;i++) { - if(type !=FF7Item::Unknown){if(Items.type(i) == type){combo_item->addItem(Items.icon(i),Items.name(i));}} - else{combo_item->addItem(Items.icon(i),Items.name(i));} + if(type !=FF7Item::Unknown){if(Items->type(i) == type){combo_item->addItem(Items->icon(i),Items->name(i));}} + else{combo_item->addItem(Items->icon(i),Items->name(i));} } - current_item = Items.itemEncode(id,Items.itemQty(current_item)); - if(current_item !=FF7Item::EmptyItemData){combo_item->setCurrentIndex(combo_item->findText(Items.name(Items.itemId(current_item))));} + current_item = Items->itemEncode(id,Items->itemQty(current_item)); + if(current_item !=FF7Item::EmptyItemData){combo_item->setCurrentIndex(combo_item->findText(Items->name(Items->itemId(current_item))));} else{combo_item->setCurrentIndex(-1);} this->layout()->update(); combo_item->blockSignals(false); @@ -112,15 +113,15 @@ { if(sb_qty->maximum()==127) { - if(combo_item->currentText()==Items.name(FF7Item::Masamune)){sb_qty->setMaximum(126);} + if(combo_item->currentText()==Items->name(FF7Item::Masamune)){sb_qty->setMaximum(126);} else{sb_qty->setMaximum(127);} } int offset = type_offset(combo_type->currentIndex()+1); - if(index+offset != Items.itemId(current_item)) + if(index+offset != Items->itemId(current_item)) { - if(current_item==FF7Item::EmptyItemData){current_item=Items.itemEncode(index+offset,sb_qty->value());} - else{current_item=Items.itemEncode(index+offset,Items.itemQty(current_item));} + if(current_item==FF7Item::EmptyItemData){current_item=Items->itemEncode(index+offset,sb_qty->value());} + else{current_item=Items->itemEncode(index+offset,Items->itemQty(current_item));} if(current_item ==FF7Item::EmptyItemData){sb_qty->setEnabled(false);} else{sb_qty->setEnabled(true);} emit(item_changed(current_item)); @@ -140,10 +141,10 @@ } else { - combo_type->setCurrentIndex(Items.type(id)-1); - combo_item->setCurrentIndex(id-type_offset(Items.type(id))); + combo_type->setCurrentIndex(Items->type(id)-1); + combo_item->setCurrentIndex(id-type_offset(Items->type(id))); sb_qty->setValue(qty); - current_item=Items.itemEncode(id,qty); + current_item=Items->itemEncode(id,qty); } this->blockSignals(false); @@ -151,7 +152,7 @@ void ItemSelector::setCurrentItem(quint16 ff7item) { this->blockSignals(true); - if((Items.itemId(ff7item) == FF7Item::Masamune) && (Items.itemQty(ff7item) ==127)){ ff7item = Items.itemEncode(FF7Item::Masamune,126);} + if((Items->itemId(ff7item) == FF7Item::Masamune) && (Items->itemQty(ff7item) ==127)){ ff7item = Items->itemEncode(FF7Item::Masamune,126);} if(ff7item ==FF7Item::EmptyItemData) { @@ -161,18 +162,18 @@ } else { - combo_type->setCurrentIndex(Items.type(Items.itemId(ff7item))-1); - combo_item->setCurrentIndex(Items.itemId(ff7item) - type_offset(Items.type(Items.itemId(ff7item)))); - sb_qty->setValue(Items.itemQty(ff7item)); + combo_type->setCurrentIndex(Items->type(Items->itemId(ff7item))-1); + combo_item->setCurrentIndex(Items->itemId(ff7item) - type_offset(Items->type(Items->itemId(ff7item)))); + sb_qty->setValue(Items->itemQty(ff7item)); current_item=ff7item; } this->blockSignals(false); } void ItemSelector::sb_qty_changed(int qty) { - if(qty != Items.itemQty(current_item)) + if(qty != Items->itemQty(current_item)) { - current_item = Items.itemEncode(Items.itemId(current_item),qty); + current_item = Items->itemEncode(Items->itemId(current_item),qty); emit(item_changed(current_item)); } } @@ -200,7 +201,7 @@ } return offset; } -int ItemSelector::id(void){return (int)Items.itemId(current_item);} +int ItemSelector::id(void){return (int)Items->itemId(current_item);} int ItemSelector::combo_item_width(){return combo_item->width();} int ItemSelector::combo_type_width(){return combo_type->width();} int ItemSelector::qty_width(){return sb_qty->width()+btn_remove->width();} diff -Nru blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.h blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.h --- blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.h 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/ItemSelector.h 2015-07-01 07:46:46.000000000 +0000 @@ -53,7 +53,7 @@ void init_connections(); void init_data(); int type_offset(int type); - FF7Item Items; + FF7Item *Items; QComboBox *combo_type; QComboBox *combo_item; QSpinBox *sb_qty; diff -Nru blackchocobo-1.9.831/ff7tk/widgets/LocationViewer.cpp blackchocobo-1.9.831/ff7tk/widgets/LocationViewer.cpp --- blackchocobo-1.9.831/ff7tk/widgets/LocationViewer.cpp 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/LocationViewer.cpp 2015-07-01 07:46:46.000000000 +0000 @@ -46,10 +46,13 @@ void LocationViewer::init_display(void) { + qreal scaleX= qApp->desktop()->logicalDpiX()/96; + qreal scaleY= qApp->desktop()->logicalDpiY()/96; + lblLocationPreview = new QLabel; - lblLocationPreview->setScaledContents(true); - lblLocationPreview->setMinimumSize(320,240); - lblLocationPreview->setBaseSize(640,480); + //lblLocationPreview->setScaledContents(true); + lblLocationPreview->setMinimumSize(320*scaleX,240*scaleY); + lblLocationPreview->setBaseSize(640*scaleX,480*scaleY); lblLocationPreview->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); QTableWidgetItem *newItem; @@ -95,12 +98,12 @@ newItem->setFlags(newItem->flags()&=~Qt::ItemIsEditable); newItem->setTextAlignment(Qt::AlignHCenter); locationTable->setItem(i,2,newItem); - locationTable->setRowHeight(i,font().pointSize()*3+2); + locationTable->setRowHeight(i,font().pointSize()*3+2); } locationTable->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); - locationTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + locationTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); locationTable->adjustSize(); - locationTable->setFixedWidth(locationTable->columnWidth(0)+locationTable->columnWidth(1)+locationTable->columnWidth(2)+locationTable->verticalScrollBar()->widthMM()+fontMetrics().width(QChar('W'))); + locationTable->setFixedWidth(locationTable->columnWidth(0)+locationTable->columnWidth(1)+locationTable->columnWidth(2)+locationTable->verticalScrollBar()->widthMM()+fontMetrics().width(QChar('W'))); locationTable->setCurrentCell(-1,-1); locationTable->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding); @@ -121,8 +124,10 @@ actionCaseSensitive = new QAction(tr("Case Sensitive"),btnSearchOptions); actionCaseSensitive->setCheckable(true); + QString menuStyle = QString("QCheckbox::indicator { width: %1px; height: %2px;}").arg(QString::number(16*scaleX),QString::number(16*scaleY)); + QMenu * newMenu=new QMenu; - newMenu->setStyleSheet(this->styleSheet()); + newMenu->setStyleSheet(menuStyle); newMenu->addAction(actionNameSearch); newMenu->addAction(actionItemSearch); newMenu->addSeparator(); @@ -130,7 +135,7 @@ newMenu->addAction(actionCaseSensitive); btnSearchOptions->setMenu(newMenu); - btnSearchOptions->setFixedWidth(36); + btnSearchOptions->setFixedWidth(36*scaleX); lineTableFilter = new QLineEdit; lineTableFilter->setFixedWidth( locationTable->width() - btnSearchOptions->width()); @@ -335,7 +340,7 @@ if(fileName.isEmpty()){lblLocationPreview->setPixmap(QString(""));} else { - lblLocationPreview->setPixmap(QPixmap(QString("://locations/%1_%2").arg(QString::number(mapId),QString::number(locId)))); + lblLocationPreview->setPixmap(QPixmap(QString("://locations/%1_%2").arg(QString::number(mapId),QString::number(locId))).scaled(lblLocationPreview->size(),Qt::KeepAspectRatio,Qt::SmoothTransformation)); QString oldStr = Locations->locationString(fileName); QString newStr = translate(oldStr); if(oldStr !=newStr && autoUpdate) diff -Nru blackchocobo-1.9.831/ff7tk/widgets/MetadataCreator.cpp blackchocobo-1.9.831/ff7tk/widgets/MetadataCreator.cpp --- blackchocobo-1.9.831/ff7tk/widgets/MetadataCreator.cpp 2015-06-30 07:46:58.000000000 +0000 +++ blackchocobo-1.9.831/ff7tk/widgets/MetadataCreator.cpp 2015-07-01 07:46:46.000000000 +0000 @@ -26,14 +26,14 @@ initDisplay(); initConnections(); for(int i=0;i<15;i++){InFiles.append(QString(""));} - ff7 = ff7save; - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - this->setWindowTitle(tr("Create Cloud Save Folder")); - this->setFocus();// prevents lineOutPath from Having Focus and hiding its placeholder text. + ff7 = ff7save; + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); + this->setWindowTitle(tr("Create Cloud Save Folder")); + this->setFocus();// prevents lineOutPath from Having Focus and hiding its placeholder text. } void MetadataCreator::initDisplay(void) { - this->setMinimumSize(458,438); + this->setMinimumSize(458*qApp->desktop()->logicalDpiX()/96,438*qApp->desktop()->logicalDpiY()/96); lblOut= new QLabel(tr("Output Path:")); lineOutPath = new QLineEdit; lineOutPath->setPlaceholderText(tr("Folder To Write Files Into"));