Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 20293 → Rev 20294

/trunk/Scribus/.travis.yml
0,0 → 1,36
language: cpp
 
compiler:
- gcc
- clang
 
dist: trusty
 
before_install:
- sudo apt-get update -qq
- sudo apt-get install cmake libboost-python-dev libcups2-dev libhunspell-dev
libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev
python-all-dev zlib1g-dev qtbase5-dev qtdeclarative5-dev libqt5opengl5-dev
qttools5-dev qttools5-dev-tools libgraphicsmagick++1-dev
libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev libmspub-dev
libcdr-dev libvisio-dev
 
script:
- if [[ $CC == gcc ]]; then
export NPROC=8;
else
export NPROC=1;
fi
 
- cmake .
- make -j$NPROC
 
notifications:
email: false
irc:
channels:
- "chat.freenode.net#scribus-dev"
template:
- "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
on_success: always
on_failure: always
/trunk/Scribus/Scribus.pro
1,11 → 1,10
######################################################################
# Automatically generated by qmake (3.0) Sat Jul 25 00:01:36 2015
# Automatically generated by qmake (3.0) Mon Jul 27 22:43:40 2015
######################################################################
 
TEMPLATE = app
TARGET = Scribus
INCLUDEPATH += .
INCLUDEPATH += ./scribus
 
# Input
HEADERS += scribus/actionmanager.h \
/trunk/Scribus/scribus/ui/resourcemanager.cpp
24,6 → 24,7
#include <QDomDocument>
#include <QFile>
#include <QFileInfo>
#include <QPushButton>
#include <QString>
#include <QStringList>
#include <QTableWidget>
52,6 → 53,7
connect(categoryComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(categoryChanged()));
connect(updateAvailableButton, SIGNAL(clicked()), this, SLOT(updateDownloadLists()));
connect(downloadButton, SIGNAL(clicked()), this, SLOT(startDownload()));
connect(showLicenseToolButton, SIGNAL(clicked()), this, SLOT(showLicenseArea()));
}
 
void ResourceManager::languageChange()
722,3 → 724,16
}
}
 
void ResourceManager::showLicenseArea()
{
licenseLabel->setVisible(!licenseLabel->isVisible());
licenseTextBrowser->setVisible(licenseLabel->isVisible());
if(licenseLabel->isVisible())
licenseVerticalSpacer->changeSize(20,36,QSizePolicy::Fixed,QSizePolicy::Fixed);
else
licenseVerticalSpacer->changeSize(0,0,QSizePolicy::Fixed,QSizePolicy::Fixed);
resize(1, 1); // megahack to keep palette small
updateGeometry();
adjustSize();
}
 
/trunk/Scribus/scribus/ui/resourcemanager.h
92,6 → 92,7
void downloadFilesFinished();
void updateProgressBar();
void startDownload();
void showLicenseArea();
 
};
 
/trunk/Scribus/scribus/ui/resourcemanagerbase.ui
Cannot display: file marked as a binary type.
svn:mime-type = application/xml