Skip to content
Snippets Groups Projects
Commit 6ac1d9db authored by Jérémy Quentin's avatar Jérémy Quentin
Browse files

[#1700] Cannot build on ubuntu 8.10 and a few other distribs

parent b20195a9
Branches
Tags
No related merge requests found
......@@ -56,7 +56,6 @@ ConfigurationDialog::ConfigurationDialog(sflphone_kdeView *parent) : QDialog(par
toolButton_codecDown->setIcon(style->standardIcon(QStyle::SP_ArrowDown));
tableWidget_codecs->verticalHeader()->hide();
tableWidget_codecs->setSelectionBehavior(QAbstractItemView::SelectRows);
//tableWidget_codecs->setStyleSheet("border-style: hidden;");
......@@ -513,12 +512,25 @@ void ConfigurationDialog::loadCodecs()
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
QStringList codecList = configurationManager.getCodecList();
QStringList activeCodecList = configurationManager.getActiveCodecList();
#if QT_VERSION >= 0x040500
activeCodecList.removeDuplicates();
#else
for (int i = 0 ; i < activeCodecList.size() ; i++)
{
if(activeCodecList.lastIndexOf(activeCodecList[i]) != i)
{
activeCodecList.removeAt(i);
i--;
}
}
#endif
for (int i=0 ; i<activeCodecList.size() ; i++)
{
if(! codecList.contains(activeCodecList[i]))
{
activeCodecList.removeAt(i);
i--;
}
}
QStringList codecListToDisplay = activeCodecList;
......@@ -664,6 +676,10 @@ void ConfigurationDialog::on_toolButton_codecUp_clicked()
tableWidget_codecs->setItem(currentRow - 1, i , item1);
tableWidget_codecs->setItem(currentRow, i , item2);
}
QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow - 1);
tableWidget_codecs->setVerticalHeaderItem(currentRow - 1, item1);
tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
tableWidget_codecs->setCurrentCell(currentRow - 1, currentCol);
}
......@@ -680,6 +696,10 @@ void ConfigurationDialog::on_toolButton_codecDown_clicked()
tableWidget_codecs->setItem(currentRow + 1, i , item1);
tableWidget_codecs->setItem(currentRow, i , item2);
}
QTableWidgetItem * item1 = tableWidget_codecs->takeVerticalHeaderItem(currentRow);
QTableWidgetItem * item2 = tableWidget_codecs->takeVerticalHeaderItem(currentRow + 1);
tableWidget_codecs->setVerticalHeaderItem(currentRow + 1, item1);
tableWidget_codecs->setVerticalHeaderItem(currentRow, item2);
tableWidget_codecs->setCurrentCell(currentRow + 1, currentCol);
}
......
sflphone-client-kde/src/icons/add.png

612 B | W: | H:

sflphone-client-kde/src/icons/add.png

564 B | W: | H:

sflphone-client-kde/src/icons/add.png
sflphone-client-kde/src/icons/add.png
sflphone-client-kde/src/icons/add.png
sflphone-client-kde/src/icons/add.png
  • 2-up
  • Swipe
  • Onion skin
sflphone-client-kde/src/icons/remove.png

888 B | W: | H:

sflphone-client-kde/src/icons/remove.png

332 B | W: | H:

sflphone-client-kde/src/icons/remove.png
sflphone-client-kde/src/icons/remove.png
sflphone-client-kde/src/icons/remove.png
sflphone-client-kde/src/icons/remove.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -2,7 +2,7 @@ Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
Standards-Version: 3.7.3
Package: sflphone-client-kde
......
......@@ -2,7 +2,7 @@ Source: sflphone-client-kde
Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
Section: kde
Priority: optional
Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
Build-Depends: debhelper (>= 5), cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2), libqt4-dev (>=4.3)
Standards-Version: 3.7.3
Package: sflphone-client-kde
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment