diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp index 198076d84..588bff379 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp @@ -80,6 +80,11 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId connect(generateCheckBox, SIGNAL(toggled(bool)), generateSpinBox, SLOT(setEnabled(bool))); connect(aspectRatio_CB,SIGNAL(currentIndexChanged(int)),this,SLOT(changeAspectRatio(int))); + aspectRatio_CB->setItemIcon(0,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-auto.svg")); + aspectRatio_CB->setItemIcon(1,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-1-1.svg")); + aspectRatio_CB->setItemIcon(2,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-3-4.svg")); + aspectRatio_CB->setItemIcon(3,FilesDefs::getIconFromQtResourcePath(":/icons/svg/ratio-16-9.svg")); + generateSpinBox->setEnabled(false); preview_W->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE),true); diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui index 30d316329..6041dc13e 100644 --- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui +++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui @@ -171,7 +171,7 @@ p, li { white-space: pre-wrap; } Add Channel Thumbnail - + :/icons/png/add-image.png:/icons/png/add-image.png @@ -184,6 +184,12 @@ p, li { white-space: pre-wrap; } + + + 24 + 24 + + Auto @@ -212,7 +218,7 @@ p, li { white-space: pre-wrap; } Add File to Attach - + :/icons/png/add-file.png:/icons/png/add-file.png @@ -312,7 +318,7 @@ p, li { white-space: pre-wrap; } - + :/icons/png/add-file.png:/icons/png/add-file.png @@ -336,7 +342,7 @@ p, li { white-space: pre-wrap; } 0 0 - 98 + 84 24 @@ -416,7 +422,7 @@ p, li { white-space: pre-wrap; } Channel Post - + :/icons/png/comment.png:/icons/png/comment.png @@ -446,7 +452,7 @@ p, li { white-space: pre-wrap; } Attachments - + :/icons/png/attachements.png:/icons/png/attachements.png @@ -518,7 +524,6 @@ p, li { white-space: pre-wrap; } - diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 71a5015a1..a66c98cf5 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -2,6 +2,10 @@ icons/onion.png icons/svg/hidden.svg + icons/svg/ratio-auto.svg + icons/svg/ratio-1-1.svg + icons/svg/ratio-3-4.svg + icons/svg/ratio-16-9.svg icons/svg/randomness.svg icons/svg/password.svg icons/svg/listlayout.svg diff --git a/retroshare-gui/src/gui/icons/svg/ratio-1-1.svg b/retroshare-gui/src/gui/icons/svg/ratio-1-1.svg new file mode 100644 index 000000000..07dd49dc7 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/ratio-1-1.svg @@ -0,0 +1,97 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/icons/svg/ratio-16-9.svg b/retroshare-gui/src/gui/icons/svg/ratio-16-9.svg new file mode 100644 index 000000000..d7e3526c4 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/ratio-16-9.svg @@ -0,0 +1,2 @@ + + diff --git a/retroshare-gui/src/gui/icons/svg/ratio-3-4.svg b/retroshare-gui/src/gui/icons/svg/ratio-3-4.svg new file mode 100644 index 000000000..8a94fe380 --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/ratio-3-4.svg @@ -0,0 +1,2 @@ + + diff --git a/retroshare-gui/src/gui/icons/svg/ratio-auto.svg b/retroshare-gui/src/gui/icons/svg/ratio-auto.svg new file mode 100644 index 000000000..f995555ad --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/ratio-auto.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +