mirror of
https://github.com/MaurycyLiebner/enve.git
synced 2024-12-18 22:52:06 +00:00
Compare commits
2 Commits
b240c39cb2
...
60eeccbf26
Author | SHA1 | Date | |
---|---|---|---|
|
60eeccbf26 | ||
|
6b3925ebb4 |
@ -943,7 +943,7 @@ void MainWindow::setupToolBar() {
|
|||||||
mRectangleMode = SwitchButton::sCreate2Switch(
|
mRectangleMode = SwitchButton::sCreate2Switch(
|
||||||
"toolbarButtons/rectCreateUnchecked.png",
|
"toolbarButtons/rectCreateUnchecked.png",
|
||||||
"toolbarButtons/rectCreateChecked.png",
|
"toolbarButtons/rectCreateChecked.png",
|
||||||
gSingleLineTooltip(tr("Add Rectange Mode", "ToolBar"), "F7"), this);
|
gSingleLineTooltip(tr("Add Rectangle Mode", "ToolBar"), "F7"), this);
|
||||||
mToolBar->addWidget(mRectangleMode);
|
mToolBar->addWidget(mRectangleMode);
|
||||||
|
|
||||||
mTextMode = SwitchButton::sCreate2Switch(
|
mTextMode = SwitchButton::sCreate2Switch(
|
||||||
|
@ -380,7 +380,7 @@ macx {
|
|||||||
-change /usr/local/lib/libtcmalloc.4.dylib @rpath/libtcmalloc.4.dylib \
|
-change /usr/local/lib/libtcmalloc.4.dylib @rpath/libtcmalloc.4.dylib \
|
||||||
$$MAC_APP_FOLDER/Contents/MacOS/$$TARGET
|
$$MAC_APP_FOLDER/Contents/MacOS/$$TARGET
|
||||||
|
|
||||||
# Wrap all application depdendencies for deployment. Apply -dmg flag for release DMG image.
|
# Wrap all application dependencies for deployment. Apply -dmg flag for release DMG image.
|
||||||
# Use -appstore-compliant flag to workaround the inclusion of OBDC and PostgreSQL plugins.
|
# Use -appstore-compliant flag to workaround the inclusion of OBDC and PostgreSQL plugins.
|
||||||
CONFIG(release, debug|release): QMAKE_POST_LINK += && macdeployqt $$MAC_APP_FOLDER -appstore-compliant -dmg
|
CONFIG(release, debug|release): QMAKE_POST_LINK += && macdeployqt $$MAC_APP_FOLDER -appstore-compliant -dmg
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ what you want with it.
|
|||||||
|
|
||||||
If you accept this license, a new brush group named 'deevad-v6' will
|
If you accept this license, a new brush group named 'deevad-v6' will
|
||||||
be created. More infos on the brushes on my blog, or my deviant-art
|
be created. More infos on the brushes on my blog, or my deviant-art
|
||||||
account , under the ressources category.
|
account, under the resources category.
|
||||||
|
|
||||||
Released in end october 2012
|
Released in end october 2012
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"comment": "MyPaint brush file",
|
"comment": "MyPaint brush file",
|
||||||
"description": "Soft Fine Fountain Pen",
|
"description": "Soft Fine Fountain Pen",
|
||||||
"group": "",
|
"group": "",
|
||||||
"notes": "Quick movements will starve ink suppy. Hard pressure will cause \"railroading\". Can splatter a bit.\n\nAuthor: Brien Dieterle\nLicense: CC0/Public Domain",
|
"notes": "Quick movements will starve ink supply. Hard pressure will cause \"railroading\". Can splatter a bit.\n\nAuthor: Brien Dieterle\nLicense: CC0/Public Domain",
|
||||||
"parent_brush_name": "Dieterle/Fount-offset#1",
|
"parent_brush_name": "Dieterle/Fount-offset#1",
|
||||||
"settings": {
|
"settings": {
|
||||||
"anti_aliasing": {
|
"anti_aliasing": {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"comment": "MyPaint brush file",
|
"comment": "MyPaint brush file",
|
||||||
"description": "Soft Fine Fountain Pen",
|
"description": "Soft Fine Fountain Pen",
|
||||||
"group": "",
|
"group": "",
|
||||||
"notes": "Quick movements will starve ink suppy. Hard pressure will cause \"railroading\". Can splatter a bit.\n\nAuthor: Brien Dieterle\nLicense: CC0/Public Domain",
|
"notes": "Quick movements will starve ink supply. Hard pressure will cause \"railroading\". Can splatter a bit.\n\nAuthor: Brien Dieterle\nLicense: CC0/Public Domain",
|
||||||
"parent_brush_name": "Dieterle/Fountain_SF#1",
|
"parent_brush_name": "Dieterle/Fountain_SF#1",
|
||||||
"settings": {
|
"settings": {
|
||||||
"anti_aliasing": {
|
"anti_aliasing": {
|
||||||
|
@ -70,7 +70,7 @@ const std::map<uint64_t, QString> gChannelLayouts = {
|
|||||||
{AV_CH_BACK_LEFT, "Back left"},
|
{AV_CH_BACK_LEFT, "Back left"},
|
||||||
{AV_CH_BACK_RIGHT, "Back right"},
|
{AV_CH_BACK_RIGHT, "Back right"},
|
||||||
{AV_CH_TOP_CENTER, "Top center"},
|
{AV_CH_TOP_CENTER, "Top center"},
|
||||||
{AV_CH_TOP_FRONT_LEFT, "Top fron left"},
|
{AV_CH_TOP_FRONT_LEFT, "Top front left"},
|
||||||
{AV_CH_TOP_FRONT_CENTER, "Top front center"},
|
{AV_CH_TOP_FRONT_CENTER, "Top front center"},
|
||||||
{AV_CH_TOP_FRONT_RIGHT, "Top front right"},
|
{AV_CH_TOP_FRONT_RIGHT, "Top front right"},
|
||||||
{AV_CH_TOP_BACK_LEFT, "Top back left"},
|
{AV_CH_TOP_BACK_LEFT, "Top back left"},
|
||||||
|
@ -156,7 +156,7 @@ void AudioStreamsData::open(AVFormatContext * const formatContext) {
|
|||||||
}
|
}
|
||||||
if(fAudioStreamIndex == -1)
|
if(fAudioStreamIndex == -1)
|
||||||
RuntimeThrow("Could not retrieve audio stream");
|
RuntimeThrow("Could not retrieve audio stream");
|
||||||
if(!audCodec) RuntimeThrow("Unsuported codec");
|
if(!audCodec) RuntimeThrow("Unsupported codec");
|
||||||
|
|
||||||
fCodecContext = avcodec_alloc_context3(audCodec);
|
fCodecContext = avcodec_alloc_context3(audCodec);
|
||||||
if(!fCodecContext) RuntimeThrow("Error allocating AVCodecContext");
|
if(!fCodecContext) RuntimeThrow("Error allocating AVCodecContext");
|
||||||
|
@ -104,7 +104,7 @@ void VideoStreamsData::open(const char * const path) {
|
|||||||
}
|
}
|
||||||
if(fVideoStreamIndex == -1)
|
if(fVideoStreamIndex == -1)
|
||||||
RuntimeThrow("Could not retrieve video stream");
|
RuntimeThrow("Could not retrieve video stream");
|
||||||
if(!vidCodec) RuntimeThrow("Unsuported codec");
|
if(!vidCodec) RuntimeThrow("Unsupported codec");
|
||||||
|
|
||||||
fCodecContext = avcodec_alloc_context3(vidCodec);
|
fCodecContext = avcodec_alloc_context3(vidCodec);
|
||||||
if(!fCodecContext) RuntimeThrow("Error allocating AVCodecContext");
|
if(!fCodecContext) RuntimeThrow("Error allocating AVCodecContext");
|
||||||
|
@ -238,7 +238,7 @@ void ExternalPaintAppHandler::setupFor(AnimatedSurface * const aSurface,
|
|||||||
gPrintException(false, "Could not open " + app + " using \"" + mExec + "\".\n"
|
gPrintException(false, "Could not open " + app + " using \"" + mExec + "\".\n"
|
||||||
"Make sure the path to " + app + " executable is valid.");
|
"Make sure the path to " + app + " executable is valid.");
|
||||||
deleteLater();
|
deleteLater();
|
||||||
} else gPrintException(false, "Error occured while running " + app + " using \"" + mExec + "\".\n"
|
} else gPrintException(false, "Error occurred while running " + app + " using \"" + mExec + "\".\n"
|
||||||
"Make sure the path to " + app + " executable is valid.");
|
"Make sure the path to " + app + " executable is valid.");
|
||||||
});
|
});
|
||||||
connect(execProc, qOverload<int, QProcess::ExitStatus>(&QProcess::finished),
|
connect(execProc, qOverload<int, QProcess::ExitStatus>(&QProcess::finished),
|
||||||
|
@ -95,7 +95,7 @@ qsptr<PathEffect> readIdCreatePathEffect(eReadStream &src) {
|
|||||||
const auto id = CustomIdentifier::sRead(src);
|
const auto id = CustomIdentifier::sRead(src);
|
||||||
const auto eff = CustomPathEffectCreator::sCreateForIdentifier(id);
|
const auto eff = CustomPathEffectCreator::sCreateForIdentifier(id);
|
||||||
if(eff) return eff;
|
if(eff) return eff;
|
||||||
RuntimeThrow("Unrecogized CustomPathEffect identifier " + id.toString());
|
RuntimeThrow("Unrecognized CustomPathEffect identifier " + id.toString());
|
||||||
} else RuntimeThrow("Invalid path effect type '" +
|
} else RuntimeThrow("Invalid path effect type '" +
|
||||||
QString::number(int(type)) + "'");
|
QString::number(int(type)) + "'");
|
||||||
}
|
}
|
||||||
@ -114,7 +114,7 @@ qsptr<PathEffect> readIdCreatePathEffectXEV(const QDomElement& ele) {
|
|||||||
const auto id = CustomIdentifier::sReadXEV(ele);
|
const auto id = CustomIdentifier::sReadXEV(ele);
|
||||||
const auto eff = CustomPathEffectCreator::sCreateForIdentifier(id);
|
const auto eff = CustomPathEffectCreator::sCreateForIdentifier(id);
|
||||||
if(eff) return eff;
|
if(eff) return eff;
|
||||||
RuntimeThrow("Unrecogized CustomPathEffect identifier " + id.toString());
|
RuntimeThrow("Unrecognized CustomPathEffect identifier " + id.toString());
|
||||||
} else RuntimeThrow("Invalid path effect type '" +
|
} else RuntimeThrow("Invalid path effect type '" +
|
||||||
QString::number(int(type)) + "'");
|
QString::number(int(type)) + "'");
|
||||||
}
|
}
|
||||||
|
@ -173,7 +173,7 @@ qsptr<RasterEffect> readIdCreateRasterEffect(eReadStream &src) {
|
|||||||
const auto id = CustomIdentifier::sRead(src);
|
const auto id = CustomIdentifier::sRead(src);
|
||||||
const auto eff = CustomRasterEffectCreator::sCreateForIdentifier(id);
|
const auto eff = CustomRasterEffectCreator::sCreateForIdentifier(id);
|
||||||
if(eff) return eff;
|
if(eff) return eff;
|
||||||
RuntimeThrow("Unrecogized CustomRasterEffect identifier " + id.toString());
|
RuntimeThrow("Unrecognized CustomRasterEffect identifier " + id.toString());
|
||||||
} else if(type == RasterEffectType::CUSTOM_SHADER) {
|
} else if(type == RasterEffectType::CUSTOM_SHADER) {
|
||||||
return readIdCreateShaderEffect(src);
|
return readIdCreateShaderEffect(src);
|
||||||
} else RuntimeThrow("Invalid RasterEffect type '" +
|
} else RuntimeThrow("Invalid RasterEffect type '" +
|
||||||
@ -194,7 +194,7 @@ qsptr<RasterEffect> readIdCreateRasterEffectXEV(const QDomElement& ele) {
|
|||||||
const auto id = CustomIdentifier::sReadXEV(ele);
|
const auto id = CustomIdentifier::sReadXEV(ele);
|
||||||
const auto eff = CustomRasterEffectCreator::sCreateForIdentifier(id);
|
const auto eff = CustomRasterEffectCreator::sCreateForIdentifier(id);
|
||||||
if(eff) return eff;
|
if(eff) return eff;
|
||||||
RuntimeThrow("Unrecogized CustomRasterEffect identifier " + id.toString());
|
RuntimeThrow("Unrecognized CustomRasterEffect identifier " + id.toString());
|
||||||
} else if(type == RasterEffectType::CUSTOM_SHADER) {
|
} else if(type == RasterEffectType::CUSTOM_SHADER) {
|
||||||
return readIdCreateShaderEffectXEV(ele);
|
return readIdCreateShaderEffectXEV(ele);
|
||||||
} else RuntimeThrow("Invalid RasterEffect type '" +
|
} else RuntimeThrow("Invalid RasterEffect type '" +
|
||||||
|
@ -506,7 +506,7 @@ stdsptr<ShaderEffectCreator> ShaderEffectCreator::sLoadFromFile(
|
|||||||
|
|
||||||
QDomElement root = document.firstChildElement();
|
QDomElement root = document.firstChildElement();
|
||||||
if(root.tagName() != "ShaderEffect")
|
if(root.tagName() != "ShaderEffect")
|
||||||
RuntimeThrow("Unrecogized root " + root.tagName() +
|
RuntimeThrow("Unrecognized root " + root.tagName() +
|
||||||
" in ShaderEffect source.");
|
" in ShaderEffect source.");
|
||||||
const QString effectName = root.attribute("name");
|
const QString effectName = root.attribute("name");
|
||||||
const QString menuPath = root.attribute("menuPath");
|
const QString menuPath = root.attribute("menuPath");
|
||||||
|
Loading…
Reference in New Issue
Block a user