Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Micu/make demos run again #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Micu/make demos run again #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
442ea57
Make QreziDemo and c++now_lightning_talk run again
micuintus Dec 1, 2017
d88f608
Make the "presentation frameworks" slide fit
micuintus Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions QreziDemo.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ Rectangle {
}


Code {
CodeItem {

id: slide3

code:
text:
"
template< typename X >
struct fency {
Expand Down Expand Up @@ -140,7 +140,7 @@ int main() { std::cout << fency::foo() << std::endl; }
height: 400

font.pointSize: 30
code:
text:
"
var head = function( xs ) {
return xs[0]
Expand Down
2 changes: 1 addition & 1 deletion demo_talks/c++now_lightning_talk/Slides/Braces.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Item {
language: "c++"
font.pointSize: 30

code:
text:
"int main()
{
[](){};
Expand Down
4 changes: 2 additions & 2 deletions demo_talks/c++now_lightning_talk/Slides/WeirdCast.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Flipper {
style: "obsidian"
language: "c++"
font.pointSize: 30
code:
text:
"float x = some_value;
int temp = (-1)[(int *)(&x+1)];
...
Expand All @@ -38,7 +38,7 @@ int temp = (-1)[(int *)(&x+1)];
style: "obsidian"
language: "c++"
font.pointSize: 30
code:
text:
"float x = some_value;
int temp = reinterpret_cast<int&>(x);
...
Expand Down
12 changes: 5 additions & 7 deletions demo_talks/c++now_lightning_talk/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ Qrezi {
, this_presi
]

current_frame: title

Frame {
id: title

Expand Down Expand Up @@ -94,18 +92,18 @@ Qrezi {
height: config.slide_height
x: 0
y: -800
scale: 3
scale: 2.5

title: "presentation\nframeworks"

x1: 220
y1: 160
y1: 150
x2: 100
y2: 10

font_size: 42
font_size12: 30
font_size2: 22
font_size: 30
font_size12: 22
font_size2: 16


bullets:
Expand Down
2 changes: 1 addition & 1 deletion modules/Qrezi/CodeWithText.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Rectangle {
property alias text: text_item.text
property alias text_size: text_item.s
property alias text_shadow:text_item.shadow
property alias code: code_item.code
property alias code: code_item.text
property alias code_size: code_item.font.pointSize
property alias language: code_item.language
property alias style: code_item.style
Expand Down